更换数据库表和前端链接

PacsOnline_Wechat_Patient/src/main/java/com/zskk/common/ZskkConfig.java

@@ -12,7 +12,6 @@ import com.jfinal.config.Interceptors;
 import com.jfinal.config.JFinalConfig;
 import com.jfinal.config.Plugins;
 import com.jfinal.config.Routes;
-import com.jfinal.core.JFinal;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;

PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WebBridgeController.java

@@ -3,14 +3,14 @@ package com.zskk.controller;
 import com.jfinal.weixin.sdk.api.ApiConfigKit;
 import com.jfinal.weixin.sdk.api.SnsAccessToken;
 import com.jfinal.weixin.sdk.jfinal.ApiController;
-import com.zskk.model.User;
+import com.zskk.model.UserWechat;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.UserService;
 import com.zskk.service.WeixinService;
 
 public class WebBridgeController extends ApiController {
 
-	private static String WEB_BASR_URL = "http://wechat.client.pacsonline.cn/#";
+	private static String WEB_BASR_URL = "https://wechatclient3.pacsonline.cn/#";
 	
 	public void addBinding() {
 		this.process(WEB_BASR_URL+"/bind");
@@ -50,7 +50,7 @@ public class WebBridgeController extends ApiController {
 				SnsAccessToken snsAccessToken = wService.getWebAccessToken(ApiConfigKit.getApiConfig().getAppId(), ApiConfigKit.getApiConfig().getAppSecret(), code);
 
 				UserService uService = ServiceFactory.getService(UserService.class);
-				User user = User.dao.findFirst("select * from user where wx_openid=?",snsAccessToken.getOpenid());
+				UserWechat user = UserWechat.dao.findFirst("select * from user_wechat where wx_openid=?",snsAccessToken.getOpenid());
 
 				if (user == null && snsAccessToken.getOpenid() != null) {
 					user = uService.createWxUserByAppid(snsAccessToken.getOpenid(), ApiConfigKit.getApiConfig().getAppId());
@@ -63,13 +63,13 @@ public class WebBridgeController extends ApiController {
 				this.redirect(toUrl + uidStr + snsAccessToken.getOpenid());
 			} else {
 				UserService uService = ServiceFactory.getService(UserService.class);
-				User userWechats = (User) sessionObj;
-				User users = User.dao.findById(userWechats.getId());
+				UserWechat userWechats = (UserWechat) sessionObj;
+				UserWechat users = UserWechat.dao.findById(userWechats.getId());
 				String uidStr = toUrl.contains("?") ? "&openid=" : "?openid=";
 				if (users == null) {
 					userWechats = uService.createWxUserByAppid(userWechats.getWxOpenid(), ApiConfigKit.getApiConfig().getAppId());
 				}
-				User users2 = User.dao.findFirst("select * from user where wx_openid=?",userWechats.getWxOpenid());
+				UserWechat users2 = UserWechat.dao.findFirst("select * from user_wechat where wx_openid=?",userWechats.getWxOpenid());
 				if (users2 != null && users2.getWxIcon().isEmpty()) {
 //					uService.getUserInfo(userWechats.getWxOpenid());
 //					wService.getWebWeixinUserInfo(snsAccessToken.getAccessToken(), snsAccessToken.getOpenid());

PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinApiController.java

@@ -20,7 +20,7 @@ import com.jfinal.weixin.sdk.jfinal.ApiController;
 import com.zskk.model.Exams;
 import com.zskk.model.Institution;
 import com.zskk.model.Report;
-import com.zskk.model.User;
+import com.zskk.model.UserWechat;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.WeixinService;
 import com.zskk.service.bean.WxJSConfigBean;
@@ -113,8 +113,8 @@ public class WeixinApiController extends ApiController {
         JSONObject json = JSON.parseObject(apiResult.getJson());
         JSONObject json2 = json.getObject("data", JSONObject.class);
         JSONArray jsonArray = json2.getJSONArray("openid");
-        List<User> users = User.dao.find("SELECT * FROM pacsonline.user where source='测试微信'");
-        for (User user : users) {
+        List<UserWechat> users = UserWechat.dao.find("SELECT * FROM user_wechat where source='测试微信'");
+        for (UserWechat user : users) {
 			if (jsonArray.contains(user.getWxOpenid())) {
 				user.setSource("辽宁省电子胶片平台");
 //				user.update();
@@ -184,9 +184,6 @@ public class WeixinApiController extends ApiController {
     {
         String reportId = getPara("reportId");
 		Report reports = Report.dao.findById(reportId);
-		if (reports == null) {
-			
-		}
 		Exams exams = Exams.dao.findById(reports.getExamId());
 		Institution institution = Institution.dao.findById(exams.getInstitutionId());
 		String appId;
@@ -221,7 +218,6 @@ public class WeixinApiController extends ApiController {
      */
     public void getQrcode(String reportId)
     {
-//        String reportId = getPara("reportId");
 		Report reports = Report.dao.findById(reportId);
 		if (reportId == null || reports == null) {
 			renderNull();

PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinMsgController.java

@@ -17,8 +17,8 @@ import com.jfinal.weixin.sdk.msg.in.speech_recognition.InSpeechRecognitionResult
 import com.jfinal.weixin.sdk.msg.out.OutCustomMsg;
 import com.jfinal.weixin.sdk.msg.out.OutTextMsg;
 import com.zskk.model.Exams;
-import com.zskk.model.User;
-import com.zskk.model.UserBind;
+import com.zskk.model.UserWechat;
+import com.zskk.model.WechatBind;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.UserService;
 
@@ -39,7 +39,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 					"【声明】为保证客户数据隐私安全，电子胶片示例涉及检查信息、用户信息、医疗机构信息等均已经过数据脱敏处理。\n通过以下途径了解更多或联系我们：\n官方网站：<a href=\"http://www.pacsonline.cn\">点击进入</a>\n咨询热线：010-53932350\n电子邮箱：company@pacsonline.cn\n您即将收到数字影像示例，请点击下方消息查看，谢谢您的使用！");
 
 			String toUrlString = String.format(
-					"http://wechat.client.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s", "test",
+					"https://wechatclient3.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s", "test",
 					"116edead589fa976", "116edead577aac99");
 
 			List<Articles> list = new ArrayList<Articles>();
@@ -116,17 +116,17 @@ public class WeixinMsgController extends MsgControllerAdapter {
 	protected void processInFollowEvent(InFollowEvent inFollowEvent) {
 		if (InFollowEvent.EVENT_INFOLLOW_SUBSCRIBE.equals(inFollowEvent.getEvent())) {
 			log.debug("关注：" + inFollowEvent.getFromUserName());
-			User findUser = User.dao.findFirst("select * from user where wx_openid = ?",
+			UserWechat findUser = UserWechat.dao.findFirst("select * from user_wechat where wx_openid = ?",
 					inFollowEvent.getFromUserName());
 			if (findUser == null) {
 				UserService aService = ServiceFactory.getService(UserService.class);
-				User users = aService.createWxUserByGH(inFollowEvent.getFromUserName(), inFollowEvent.getToUserName());
+				UserWechat users = aService.createWxUserByGH(inFollowEvent.getFromUserName(), inFollowEvent.getToUserName());
 
 				List<Articles> list = new ArrayList<Articles>();
 				Articles articles1 = new Articles();
 				articles1.setTitle("欢迎关注中世康恺电子胶片平台，点此进入");
 				articles1.setDescription("点击页面绑定手机号或检查信息，立即查看电子胶片");
-				articles1.setUrl("http://wechat.client.pacsonline.cn/#/bind?openid=" + inFollowEvent.getFromUserName());
+				articles1.setUrl("https://wechatclient3.pacsonline.cn/#/bind?openid=" + inFollowEvent.getFromUserName());
 				articles1.setPicurl("http://work.pacsonline.cn/static/img/banner.e8ee043.png");
 				list.add(articles1);
 				CustomServiceApi.sendNews(inFollowEvent.getFromUserName(), list);
@@ -141,7 +141,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 		// 如果为取消关注事件，将无法接收到传回的信息
 		if (InFollowEvent.EVENT_INFOLLOW_UNSUBSCRIBE.equals(inFollowEvent.getEvent())) {
 			log.debug("取消关注：" + inFollowEvent.getFromUserName());
-			User findUser = User.dao.findFirst("select * from user where wx_openid = ?",
+			UserWechat findUser = UserWechat.dao.findFirst("select * from user_wechat where wx_openid = ?",
 					inFollowEvent.getFromUserName());
 			findUser.setSubscribeStatus(1);
 			findUser.update();
@@ -152,7 +152,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 	protected void processInQrCodeEvent(InQrCodeEvent inQrCodeEvent) {
 		if (InQrCodeEvent.EVENT_INQRCODE_SUBSCRIBE.equals(inQrCodeEvent.getEvent())) {
 			log.debug("扫码未关注：" + inQrCodeEvent.getFromUserName());
-			User findUser = User.dao.findFirst("select * from user where wx_openid = ?",
+			UserWechat findUser = UserWechat.dao.findFirst("select * from user_wechat where wx_openid = ?",
 					inQrCodeEvent.getFromUserName());
 			String rid = inQrCodeEvent.getEventKey();
 			String[] arr = rid.split("_");
@@ -161,7 +161,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 						"【声明】为保证客户数据隐私安全，电子胶片示例涉及检查信息、用户信息、医疗机构信息等均已经过数据脱敏处理。\n通过以下途径了解更多或联系我们：\n官方网站：<a href=\"http://www.pacsonline.cn\">点击进入</a>\n咨询热线：010-53932350\n电子邮箱：company@pacsonline.cn\n您即将收到数字影像示例，请点击下方消息查看，谢谢您的使用！");
 
 				String toUrlString = String.format(
-						"http://wechat.client.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
+						"https://wechatclient3.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
 						"test", "116edead589fa976", "116edead577aac99");
 
 				List<Articles> list = new ArrayList<Articles>();
@@ -181,12 +181,12 @@ public class WeixinMsgController extends MsgControllerAdapter {
 				return;
 			}
 			String toUrlString = String.format(
-					"http://wechat.client.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
+					"https://wechatclient3.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
 					inQrCodeEvent.getFromUserName(), exams.getId(), exams.getStudyId());
 			if (findUser == null) {
 				UserService uService = ServiceFactory.getService(UserService.class);
-				User users = uService.createWxUserByGH(inQrCodeEvent.getFromUserName(), inQrCodeEvent.getToUserName());
-				UserBind userBind = UserBind.dao.findFirst("select * from user_bind where user_id=? and exam_id=?",
+				UserWechat users = uService.createWxUserByGH(inQrCodeEvent.getFromUserName(), inQrCodeEvent.getToUserName());
+				WechatBind userBind = WechatBind.dao.findFirst("select * from wechat_bind where user_id=? and exam_id=?",
 						users.getId(), exams.getId());
 				if (userBind == null) {
 					uService.bindUserReport(users.getId(), exams);
@@ -196,7 +196,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 				Articles articles = new Articles();
 				articles.setTitle("欢迎关注中世康恺电子胶片平台，点此进入");
 				articles.setDescription("点击页面绑定手机号或检查信息，立即查看电子胶片");
-				articles.setUrl("http://wechat.client.pacsonline.cn/#/bind?openid=" + inQrCodeEvent.getFromUserName());
+				articles.setUrl("https://wechatclient3.pacsonline.cn/#/bind?openid=" + inQrCodeEvent.getFromUserName());
 				articles.setPicurl("http://work.pacsonline.cn/static/img/banner.e8ee043.png");
 				listgz.add(articles);
 				CustomServiceApi.sendNews(inQrCodeEvent.getFromUserName(), listgz);
@@ -215,7 +215,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 				findUser.setSubscribeStatus(2);
 				findUser.update();
 
-				UserBind userBind = UserBind.dao.findFirst("select * from user_bind where user_id=? and exam_id=?",
+				WechatBind userBind = WechatBind.dao.findFirst("select * from wechat_bind where user_id=? and exam_id=?",
 						findUser.getId(), exams.getId());
 				if (userBind == null) {
 					uService.bindUserReport(findUser.getId(), exams);
@@ -242,7 +242,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 						"【声明】为保证客户数据隐私安全，电子胶片示例涉及检查信息、用户信息、医疗机构信息等均已经过数据脱敏处理。\n通过以下途径了解更多或联系我们：\n官方网站：<a href=\"http://www.pacsonline.cn\">点击进入</a>\n咨询热线：010-53932350\n电子邮箱：company@pacsonline.cn\n您即将收到数字影像示例，请点击下方消息查看，谢谢您的使用！");
 
 				String toUrlString = String.format(
-						"http://wechat.client.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
+						"https://wechatclient3.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
 						"test", "116edead589fa976", "116edead577aac99");
 
 				List<Articles> list = new ArrayList<Articles>();
@@ -258,7 +258,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 
 			}
 
-			User user = User.dao.findFirst("select * from user where wx_openid = ?", inQrCodeEvent.getFromUserName());
+			UserWechat user = UserWechat.dao.findFirst("select * from user_wechat where wx_openid = ?", inQrCodeEvent.getFromUserName());
 
 			UserService uService = ServiceFactory.getService(UserService.class);
 
@@ -268,7 +268,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 
 			Exams exams = Exams.dao.findById(arr[1]);
 
-			UserBind userBind = UserBind.dao.findFirst("select * from user_bind where user_id=? and exam_id=?",
+			WechatBind userBind = WechatBind.dao.findFirst("select * from wechat_bind where user_id=? and exam_id=?",
 					user.getId(), exams.getId());
 
 			if (userBind == null) {
@@ -276,7 +276,7 @@ public class WeixinMsgController extends MsgControllerAdapter {
 			}
 
 			String toUrlString = String.format(
-					"http://wechat.client.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
+					"https://wechatclient3.pacsonline.cn/#/reportInfo/report?openid=%s&exam_id=%s&study_id=%s",
 					inQrCodeEvent.getFromUserName(), exams.getId(), exams.getStudyId());
 			List<Articles> list = new ArrayList<Articles>();
 			Articles articles1 = new Articles();

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/User.java

@@ -1,11 +0,0 @@
-package com.zskk.model;
-
-import com.zskk.model.base.BaseUser;
-
-/**
- * Generated by JFinal.
- */
-@SuppressWarnings("serial")
-public class User extends BaseUser<User> {
-	public static final User dao = new User().dao();
-}

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/UserBind.java

@@ -1,11 +0,0 @@
-package com.zskk.model;
-
-import com.zskk.model.base.BaseUserBind;
-
-/**
- * Generated by JFinal.
- */
-@SuppressWarnings("serial")
-public class UserBind extends BaseUserBind<UserBind> {
-	public static final UserBind dao = new UserBind().dao();
-}

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/UserWechat.java

@@ -0,0 +1,11 @@
+package com.zskk.model;
+
+import com.zskk.model.base.BaseUserWechat;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class UserWechat extends BaseUserWechat<UserWechat> {
+	public static final UserWechat dao = new UserWechat().dao();
+}

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/_MappingKit.java

@@ -25,8 +25,7 @@ public class _MappingKit {
 		arp.addMapping("remote_application", "id", RemoteApplication.class);
 		arp.addMapping("report", "id", Report.class);
 		arp.addMapping("report_record", "id", ReportRecord.class);
-		arp.addMapping("user", "id", User.class);
-		arp.addMapping("user_bind", "id", UserBind.class);
+		arp.addMapping("user_wechat", "id", UserWechat.class);
 		arp.addMapping("wechat_bind", "id", WechatBind.class);
 	}
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseExams.java

@@ -17,92 +17,60 @@ public abstract class BaseExams<M extends BaseExams<M>> extends Model<M> impleme
 		return getStr("id");
 	}
 
-	public void setDeptId(java.lang.String deptId) {
-		set("dept_id", deptId);
-	}
-	
-	public java.lang.String getDeptId() {
-		return getStr("dept_id");
-	}
-
-	public void setPatientId(java.lang.String patientId) {
-		set("patient_id", patientId);
-	}
-	
-	public java.lang.String getPatientId() {
-		return getStr("patient_id");
-	}
-
-	public void setPatientNum(java.lang.String patientNum) {
-		set("patient_num", patientNum);
-	}
-	
-	public java.lang.String getPatientNum() {
-		return getStr("patient_num");
-	}
-
-	public void setAccessionNum(java.lang.String accessionNum) {
-		set("accession_num", accessionNum);
-	}
-	
-	public java.lang.String getAccessionNum() {
-		return getStr("accession_num");
-	}
-
-	public void setExamDatetime(java.lang.String examDatetime) {
-		set("exam_datetime", examDatetime);
+	public void setInstitutionId(java.lang.String institutionId) {
+		set("institution_id", institutionId);
 	}
 	
-	public java.lang.String getExamDatetime() {
-		return getStr("exam_datetime");
+	public java.lang.String getInstitutionId() {
+		return getStr("institution_id");
 	}
 
-	public void setExamClass(java.lang.String examClass) {
-		set("exam_class", examClass);
+	public void setName(java.lang.String name) {
+		set("name", name);
 	}
 	
-	public java.lang.String getExamClass() {
-		return getStr("exam_class");
+	public java.lang.String getName() {
+		return getStr("name");
 	}
 
-	public void setExamSubClass(java.lang.String examSubClass) {
-		set("exam_sub_class", examSubClass);
+	public void setPhone(java.lang.String phone) {
+		set("phone", phone);
 	}
 	
-	public java.lang.String getExamSubClass() {
-		return getStr("exam_sub_class");
+	public java.lang.String getPhone() {
+		return getStr("phone");
 	}
 
-	public void setExamProject(java.lang.String examProject) {
-		set("exam_project", examProject);
+	public void setCardNum(java.lang.String cardNum) {
+		set("card_num", cardNum);
 	}
 	
-	public java.lang.String getExamProject() {
-		return getStr("exam_project");
+	public java.lang.String getCardNum() {
+		return getStr("card_num");
 	}
 
-	public void setDevice(java.lang.String device) {
-		set("device", device);
+	public void setPatientNum(java.lang.String patientNum) {
+		set("patient_num", patientNum);
 	}
 	
-	public java.lang.String getDevice() {
-		return getStr("device");
+	public java.lang.String getPatientNum() {
+		return getStr("patient_num");
 	}
 
-	public void setBodyPart(java.lang.String bodyPart) {
-		set("body_part", bodyPart);
+	public void setPatientId(java.lang.String patientId) {
+		set("patient_id", patientId);
 	}
 	
-	public java.lang.String getBodyPart() {
-		return getStr("body_part");
+	public java.lang.String getPatientId() {
+		return getStr("patient_id");
 	}
 
-	public void setExamMethod(java.lang.String examMethod) {
-		set("exam_method", examMethod);
+	public void setAccessionNum(java.lang.String accessionNum) {
+		set("accession_num", accessionNum);
 	}
 	
-	public java.lang.String getExamMethod() {
-		return getStr("exam_method");
+	public java.lang.String getAccessionNum() {
+		return getStr("accession_num");
 	}
 
 	public void setHopitalizedNo(java.lang.String hopitalizedNo) {
@@ -121,244 +89,244 @@ public abstract class BaseExams<M extends BaseExams<M>> extends Model<M> impleme
 		return getStr("bed_no");
 	}
 
-	public void setClinDeptId(java.lang.String clinDeptId) {
-		set("clin_dept_id", clinDeptId);
+	public void setStudyid(java.lang.String studyid) {
+		set("studyid", studyid);
 	}
 	
-	public java.lang.String getClinDeptId() {
-		return getStr("clin_dept_id");
+	public java.lang.String getStudyid() {
+		return getStr("studyid");
 	}
 
-	public void setTechnician(java.lang.String technician) {
-		set("technician", technician);
+	public void setStudyuid(java.lang.String studyuid) {
+		set("studyuid", studyuid);
 	}
 	
-	public java.lang.String getTechnician() {
-		return getStr("technician");
+	public java.lang.String getStudyuid() {
+		return getStr("studyuid");
 	}
 
-	public void setCharge(java.lang.String charge) {
-		set("charge", charge);
+	public void setStudyId(java.lang.String studyId) {
+		set("study_id", studyId);
 	}
 	
-	public java.lang.String getCharge() {
-		return getStr("charge");
+	public java.lang.String getStudyId() {
+		return getStr("study_id");
 	}
 
-	public void setCost(java.lang.String cost) {
-		set("cost", cost);
+	public void setExamClass(java.lang.String examClass) {
+		set("exam_class", examClass);
 	}
 	
-	public java.lang.String getCost() {
-		return getStr("cost");
+	public java.lang.String getExamClass() {
+		return getStr("exam_class");
 	}
 
-	public void setClinDoctors(java.lang.String clinDoctors) {
-		set("clin_doctors", clinDoctors);
+	public void setExamProject(java.lang.String examProject) {
+		set("exam_project", examProject);
 	}
 	
-	public java.lang.String getClinDoctors() {
-		return getStr("clin_doctors");
+	public java.lang.String getExamProject() {
+		return getStr("exam_project");
 	}
 
-	public void setPhone(java.lang.String phone) {
-		set("phone", phone);
+	public void setExamDatetime(java.lang.String examDatetime) {
+		set("exam_datetime", examDatetime);
 	}
 	
-	public java.lang.String getPhone() {
-		return getStr("phone");
+	public java.lang.String getExamDatetime() {
+		return getStr("exam_datetime");
 	}
 
-	public void setInstitutionId(java.lang.String institutionId) {
-		set("institution_id", institutionId);
+	public void setExamStatus(java.lang.Integer examStatus) {
+		set("exam_status", examStatus);
 	}
 	
-	public java.lang.String getInstitutionId() {
-		return getStr("institution_id");
+	public java.lang.Integer getExamStatus() {
+		return getInt("exam_status");
 	}
 
-	public void setStudyId(java.lang.String studyId) {
-		set("study_id", studyId);
+	public void setReportResult(java.lang.String reportResult) {
+		set("report_result", reportResult);
 	}
 	
-	public java.lang.String getStudyId() {
-		return getStr("study_id");
+	public java.lang.String getReportResult() {
+		return getStr("report_result");
 	}
 
-	public void setIllnessDesc(java.lang.String illnessDesc) {
-		set("illness_desc", illnessDesc);
+	public void setReportStatus(java.lang.String reportStatus) {
+		set("report_status", reportStatus);
 	}
 	
-	public java.lang.String getIllnessDesc() {
-		return getStr("illness_desc");
+	public java.lang.String getReportStatus() {
+		return getStr("report_status");
 	}
 
-	public void setPhysSign(java.lang.String physSign) {
-		set("phys_sign", physSign);
+	public void setPayStatus(java.lang.String payStatus) {
+		set("pay_status", payStatus);
 	}
 	
-	public java.lang.String getPhysSign() {
-		return getStr("phys_sign");
+	public java.lang.String getPayStatus() {
+		return getStr("pay_status");
 	}
 
-	public void setClinDiag(java.lang.String clinDiag) {
-		set("clin_diag", clinDiag);
+	public void setStatus(java.lang.String status) {
+		set("status", status);
 	}
 	
-	public java.lang.String getClinDiag() {
-		return getStr("clin_diag");
+	public java.lang.String getStatus() {
+		return getStr("status");
 	}
 
-	public void setClinSymp(java.lang.String clinSymp) {
-		set("clin_symp", clinSymp);
+	public void setUrgent(java.lang.String urgent) {
+		set("urgent", urgent);
 	}
 	
-	public java.lang.String getClinSymp() {
-		return getStr("clin_symp");
+	public java.lang.String getUrgent() {
+		return getStr("urgent");
 	}
 
-	public void setPatientSource(java.lang.String patientSource) {
-		set("patient_source", patientSource);
+	public void setSevere(java.lang.String severe) {
+		set("severe", severe);
 	}
 	
-	public java.lang.String getPatientSource() {
-		return getStr("patient_source");
+	public java.lang.String getSevere() {
+		return getStr("severe");
 	}
 
-	public void setReqDatetime(java.util.Date reqDatetime) {
-		set("req_datetime", reqDatetime);
+	public void setFilmType(java.lang.String filmType) {
+		set("film_type", filmType);
 	}
 	
-	public java.util.Date getReqDatetime() {
-		return get("req_datetime");
+	public java.lang.String getFilmType() {
+		return getStr("film_type");
 	}
 
-	public void setReqDoctor(java.lang.String reqDoctor) {
-		set("req_doctor", reqDoctor);
+	public void setDelDatetime(java.util.Date delDatetime) {
+		set("del_datetime", delDatetime);
 	}
 	
-	public java.lang.String getReqDoctor() {
-		return getStr("req_doctor");
+	public java.util.Date getDelDatetime() {
+		return get("del_datetime");
 	}
 
-	public void setRemark(java.lang.String remark) {
-		set("remark", remark);
+	public void setDelDoctorId(java.lang.String delDoctorId) {
+		set("del_doctor_id", delDoctorId);
 	}
 	
-	public java.lang.String getRemark() {
-		return getStr("remark");
+	public java.lang.String getDelDoctorId() {
+		return getStr("del_doctor_id");
 	}
 
-	public void setRegister(java.lang.String register) {
-		set("register", register);
+	public void setDelDoctorName(java.lang.String delDoctorName) {
+		set("del_doctor_name", delDoctorName);
 	}
 	
-	public java.lang.String getRegister() {
-		return getStr("register");
+	public java.lang.String getDelDoctorName() {
+		return getStr("del_doctor_name");
 	}
 
-	public void setRegisterDatetime(java.util.Date registerDatetime) {
-		set("register_datetime", registerDatetime);
+	public void setPatientArea(java.lang.String patientArea) {
+		set("patient_area", patientArea);
 	}
 	
-	public java.util.Date getRegisterDatetime() {
-		return get("register_datetime");
+	public java.lang.String getPatientArea() {
+		return getStr("patient_area");
 	}
 
-	public void setExamStatus(java.lang.Integer examStatus) {
-		set("exam_status", examStatus);
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
 	}
 	
-	public java.lang.Integer getExamStatus() {
-		return getInt("exam_status");
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
 	}
 
-	public void setStatus(java.lang.String status) {
-		set("status", status);
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
 	}
 	
-	public java.lang.String getStatus() {
-		return getStr("status");
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
 	}
 
-	public void setPayStatus(java.lang.String payStatus) {
-		set("pay_status", payStatus);
+	public void setSex(java.lang.String sex) {
+		set("sex", sex);
 	}
 	
-	public java.lang.String getPayStatus() {
-		return getStr("pay_status");
+	public java.lang.String getSex() {
+		return getStr("sex");
 	}
 
-	public void setIsRemote(java.lang.String isRemote) {
-		set("is_remote", isRemote);
+	public void setAge(java.lang.String age) {
+		set("age", age);
 	}
 	
-	public java.lang.String getIsRemote() {
-		return getStr("is_remote");
+	public java.lang.String getAge() {
+		return getStr("age");
 	}
 
-	public void setUrgent(java.lang.String urgent) {
-		set("urgent", urgent);
+	public void setBirthday(java.lang.String birthday) {
+		set("birthday", birthday);
 	}
 	
-	public java.lang.String getUrgent() {
-		return getStr("urgent");
+	public java.lang.String getBirthday() {
+		return getStr("birthday");
 	}
 
-	public void setFilmType(java.lang.String filmType) {
-		set("film_type", filmType);
+	public void setExamSubClass(java.lang.String examSubClass) {
+		set("exam_sub_class", examSubClass);
 	}
 	
-	public java.lang.String getFilmType() {
-		return getStr("film_type");
+	public java.lang.String getExamSubClass() {
+		return getStr("exam_sub_class");
 	}
 
-	public void setAnamnesis(java.lang.String anamnesis) {
-		set("anamnesis", anamnesis);
+	public void setBodyPart(java.lang.String bodyPart) {
+		set("body_part", bodyPart);
 	}
 	
-	public java.lang.String getAnamnesis() {
-		return getStr("anamnesis");
+	public java.lang.String getBodyPart() {
+		return getStr("body_part");
 	}
 
-	public void setFamilyIll(java.lang.String familyIll) {
-		set("family_ill", familyIll);
+	public void setDeviceName(java.lang.String deviceName) {
+		set("device_name", deviceName);
 	}
 	
-	public java.lang.String getFamilyIll() {
-		return getStr("family_ill");
+	public java.lang.String getDeviceName() {
+		return getStr("device_name");
 	}
 
-	public void setCreatedAt(java.util.Date createdAt) {
-		set("createdAt", createdAt);
+	public void setApplicationDepartment(java.lang.String applicationDepartment) {
+		set("application_department", applicationDepartment);
 	}
 	
-	public java.util.Date getCreatedAt() {
-		return get("createdAt");
+	public java.lang.String getApplicationDepartment() {
+		return getStr("application_department");
 	}
 
-	public void setUpdatedAt(java.util.Date updatedAt) {
-		set("updatedAt", updatedAt);
+	public void setApplicationDoctor(java.lang.String applicationDoctor) {
+		set("application_doctor", applicationDoctor);
 	}
 	
-	public java.util.Date getUpdatedAt() {
-		return get("updatedAt");
+	public java.lang.String getApplicationDoctor() {
+		return getStr("application_doctor");
 	}
 
-	public void setDeliveryDoctor(java.lang.String deliveryDoctor) {
-		set("delivery_doctor", deliveryDoctor);
+	public void setClinDiag(java.lang.String clinDiag) {
+		set("clin_diag", clinDiag);
 	}
 	
-	public java.lang.String getDeliveryDoctor() {
-		return getStr("delivery_doctor");
+	public java.lang.String getClinDiag() {
+		return getStr("clin_diag");
 	}
 
-	public void setExamReport(java.lang.String examReport) {
-		set("exam_report", examReport);
+	public void setOutPatient(java.lang.String outPatient) {
+		set("out_patient", outPatient);
 	}
 	
-	public java.lang.String getExamReport() {
-		return getStr("exam_report");
+	public java.lang.String getOutPatient() {
+		return getStr("out_patient");
 	}
 
 	public void setExt(java.lang.String ext) {
@@ -369,20 +337,12 @@ public abstract class BaseExams<M extends BaseExams<M>> extends Model<M> impleme
 		return getStr("ext");
 	}
 
-	public void setIdCard(java.lang.String idCard) {
-		set("id_card", idCard);
-	}
-	
-	public java.lang.String getIdCard() {
-		return getStr("id_card");
-	}
-
-	public void setStudyUid(java.lang.String studyUid) {
-		set("study_uid", studyUid);
+	public void setDeliveryDoctor(java.lang.String deliveryDoctor) {
+		set("delivery_doctor", deliveryDoctor);
 	}
 	
-	public java.lang.String getStudyUid() {
-		return getStr("study_uid");
+	public java.lang.String getDeliveryDoctor() {
+		return getStr("delivery_doctor");
 	}
 
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseInstitution.java

@@ -49,22 +49,6 @@ public abstract class BaseInstitution<M extends BaseInstitution<M>> extends Mode
 		return getStr("status");
 	}
 
-	public void setCreatedAt(java.util.Date createdAt) {
-		set("createdAt", createdAt);
-	}
-	
-	public java.util.Date getCreatedAt() {
-		return get("createdAt");
-	}
-
-	public void setUpdatedAt(java.util.Date updatedAt) {
-		set("updatedAt", updatedAt);
-	}
-	
-	public java.util.Date getUpdatedAt() {
-		return get("updatedAt");
-	}
-
 	public void setInstitutionLevel(java.lang.String institutionLevel) {
 		set("institution_level", institutionLevel);
 	}
@@ -145,4 +129,116 @@ public abstract class BaseInstitution<M extends BaseInstitution<M>> extends Mode
 		return getStr("wx_source");
 	}
 
+	public void setIsTest(java.lang.String isTest) {
+		set("is_test", isTest);
+	}
+	
+	public java.lang.String getIsTest() {
+		return getStr("is_test");
+	}
+
+	public void setCurrentMoney(java.lang.Integer currentMoney) {
+		set("current_money", currentMoney);
+	}
+	
+	public java.lang.Integer getCurrentMoney() {
+		return getInt("current_money");
+	}
+
+	public void setMinMoney(java.lang.Integer minMoney) {
+		set("min_money", minMoney);
+	}
+	
+	public java.lang.Integer getMinMoney() {
+		return getInt("min_money");
+	}
+
+	public void setNoticeMonoy(java.lang.Integer noticeMonoy) {
+		set("notice_monoy", noticeMonoy);
+	}
+	
+	public java.lang.Integer getNoticeMonoy() {
+		return getInt("notice_monoy");
+	}
+
+	public void setIsPay(java.lang.Integer isPay) {
+		set("is_pay", isPay);
+	}
+	
+	public java.lang.Integer getIsPay() {
+		return getInt("is_pay");
+	}
+
+	public void setProvince(java.lang.String province) {
+		set("province", province);
+	}
+	
+	public java.lang.String getProvince() {
+		return getStr("province");
+	}
+
+	public void setCity(java.lang.String city) {
+		set("city", city);
+	}
+	
+	public java.lang.String getCity() {
+		return getStr("city");
+	}
+
+	public void setDistrict(java.lang.String district) {
+		set("district", district);
+	}
+	
+	public java.lang.String getDistrict() {
+		return getStr("district");
+	}
+
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
+	public void setApiIds(java.lang.String apiIds) {
+		set("api_ids", apiIds);
+	}
+	
+	public java.lang.String getApiIds() {
+		return getStr("api_ids");
+	}
+
+	public void setFilmPrice(java.lang.Integer filmPrice) {
+		set("film_price", filmPrice);
+	}
+	
+	public java.lang.Integer getFilmPrice() {
+		return getInt("film_price");
+	}
+
+	public void setHandlingTime(java.lang.String handlingTime) {
+		set("handling_time", handlingTime);
+	}
+	
+	public java.lang.String getHandlingTime() {
+		return getStr("handling_time");
+	}
+
+	public void setPatientSms(java.lang.String patientSms) {
+		set("patient_sms", patientSms);
+	}
+	
+	public java.lang.String getPatientSms() {
+		return getStr("patient_sms");
+	}
+
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseMessages.java

@@ -121,4 +121,36 @@ public abstract class BaseMessages<M extends BaseMessages<M>> extends Model<M> i
 		return getStr("application_id");
 	}
 
+	public void setIsRemote(java.lang.String isRemote) {
+		set("is_remote", isRemote);
+	}
+	
+	public java.lang.String getIsRemote() {
+		return getStr("is_remote");
+	}
+
+	public void setExamId(java.lang.String examId) {
+		set("exam_id", examId);
+	}
+	
+	public java.lang.String getExamId() {
+		return getStr("exam_id");
+	}
+
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseOpenApplication.java

@@ -113,4 +113,20 @@ public abstract class BaseOpenApplication<M extends BaseOpenApplication<M>> exte
 		return getInt("ctime");
 	}
 
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseOperating.java

@@ -73,4 +73,20 @@ public abstract class BaseOperating<M extends BaseOperating<M>> extends Model<M>
 		return getStr("type");
 	}
 
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BasePatientInfos.java

@@ -161,6 +161,14 @@ public abstract class BasePatientInfos<M extends BasePatientInfos<M>> extends Mo
 		return getStr("family_ill");
 	}
 
+	public void setExt(java.lang.String ext) {
+		set("ext", ext);
+	}
+	
+	public java.lang.String getExt() {
+		return getStr("ext");
+	}
+
 	public void setCreatedAt(java.util.Date createdAt) {
 		set("createdAt", createdAt);
 	}
@@ -177,12 +185,4 @@ public abstract class BasePatientInfos<M extends BasePatientInfos<M>> extends Mo
 		return get("updatedAt");
 	}
 
-	public void setExt(java.lang.String ext) {
-		set("ext", ext);
-	}
-	
-	public java.lang.String getExt() {
-		return getStr("ext");
-	}
-
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseRemoteApplication.java

@@ -17,28 +17,84 @@ public abstract class BaseRemoteApplication<M extends BaseRemoteApplication<M>>
 		return getStr("id");
 	}
 
-	public void setRemoteInstitutionId(java.lang.String remoteInstitutionId) {
-		set("remote_institution_id", remoteInstitutionId);
+	public void setName(java.lang.String name) {
+		set("name", name);
 	}
 	
-	public java.lang.String getRemoteInstitutionId() {
-		return getStr("remote_institution_id");
+	public java.lang.String getName() {
+		return getStr("name");
 	}
 
-	public void setRemoteDoctorId(java.lang.String remoteDoctorId) {
-		set("remote_doctor_id", remoteDoctorId);
+	public void setSex(java.lang.String sex) {
+		set("sex", sex);
 	}
 	
-	public java.lang.String getRemoteDoctorId() {
-		return getStr("remote_doctor_id");
+	public java.lang.String getSex() {
+		return getStr("sex");
 	}
 
-	public void setLocalInstitutionId(java.lang.String localInstitutionId) {
-		set("local_institution_id", localInstitutionId);
+	public void setAge(java.lang.String age) {
+		set("age", age);
 	}
 	
-	public java.lang.String getLocalInstitutionId() {
-		return getStr("local_institution_id");
+	public java.lang.String getAge() {
+		return getStr("age");
+	}
+
+	public void setReportResult(java.lang.String reportResult) {
+		set("report_result", reportResult);
+	}
+	
+	public java.lang.String getReportResult() {
+		return getStr("report_result");
+	}
+
+	public void setPatientNum(java.lang.String patientNum) {
+		set("patient_num", patientNum);
+	}
+	
+	public java.lang.String getPatientNum() {
+		return getStr("patient_num");
+	}
+
+	public void setAccessionNum(java.lang.String accessionNum) {
+		set("accession_num", accessionNum);
+	}
+	
+	public java.lang.String getAccessionNum() {
+		return getStr("accession_num");
+	}
+
+	public void setExamDatetime(java.lang.String examDatetime) {
+		set("exam_datetime", examDatetime);
+	}
+	
+	public java.lang.String getExamDatetime() {
+		return getStr("exam_datetime");
+	}
+
+	public void setExamClass(java.lang.String examClass) {
+		set("exam_class", examClass);
+	}
+	
+	public java.lang.String getExamClass() {
+		return getStr("exam_class");
+	}
+
+	public void setExamProject(java.lang.String examProject) {
+		set("exam_project", examProject);
+	}
+	
+	public java.lang.String getExamProject() {
+		return getStr("exam_project");
+	}
+
+	public void setReportStatus(java.lang.String reportStatus) {
+		set("report_status", reportStatus);
+	}
+	
+	public java.lang.String getReportStatus() {
+		return getStr("report_status");
 	}
 
 	public void setReqDateTime(java.util.Date reqDateTime) {
@@ -49,6 +105,22 @@ public abstract class BaseRemoteApplication<M extends BaseRemoteApplication<M>>
 		return get("req_date_time");
 	}
 
+	public void setLocalInstitutionId(java.lang.String localInstitutionId) {
+		set("local_institution_id", localInstitutionId);
+	}
+	
+	public java.lang.String getLocalInstitutionId() {
+		return getStr("local_institution_id");
+	}
+
+	public void setLocalInstitutionName(java.lang.String localInstitutionName) {
+		set("local_institution_name", localInstitutionName);
+	}
+	
+	public java.lang.String getLocalInstitutionName() {
+		return getStr("local_institution_name");
+	}
+
 	public void setReqDoctorId(java.lang.String reqDoctorId) {
 		set("req_doctor_id", reqDoctorId);
 	}
@@ -57,6 +129,46 @@ public abstract class BaseRemoteApplication<M extends BaseRemoteApplication<M>>
 		return getStr("req_doctor_id");
 	}
 
+	public void setReqDoctorName(java.lang.String reqDoctorName) {
+		set("req_doctor_name", reqDoctorName);
+	}
+	
+	public java.lang.String getReqDoctorName() {
+		return getStr("req_doctor_name");
+	}
+
+	public void setRemoteInstitutionId(java.lang.String remoteInstitutionId) {
+		set("remote_institution_id", remoteInstitutionId);
+	}
+	
+	public java.lang.String getRemoteInstitutionId() {
+		return getStr("remote_institution_id");
+	}
+
+	public void setRemoteInstitutionName(java.lang.String remoteInstitutionName) {
+		set("remote_institution_name", remoteInstitutionName);
+	}
+	
+	public java.lang.String getRemoteInstitutionName() {
+		return getStr("remote_institution_name");
+	}
+
+	public void setRemoteDoctorId(java.lang.String remoteDoctorId) {
+		set("remote_doctor_id", remoteDoctorId);
+	}
+	
+	public java.lang.String getRemoteDoctorId() {
+		return getStr("remote_doctor_id");
+	}
+
+	public void setRemoteDoctorName(java.lang.String remoteDoctorName) {
+		set("remote_doctor_name", remoteDoctorName);
+	}
+	
+	public java.lang.String getRemoteDoctorName() {
+		return getStr("remote_doctor_name");
+	}
+
 	public void setIllnessDesc(java.lang.String illnessDesc) {
 		set("illness_desc", illnessDesc);
 	}
@@ -105,14 +217,6 @@ public abstract class BaseRemoteApplication<M extends BaseRemoteApplication<M>>
 		return getStr("family_ill");
 	}
 
-	public void setMarrital(java.lang.String marrital) {
-		set("marrital", marrital);
-	}
-	
-	public java.lang.String getMarrital() {
-		return getStr("marrital");
-	}
-
 	public void setRemark(java.lang.String remark) {
 		set("remark", remark);
 	}
@@ -145,14 +249,6 @@ public abstract class BaseRemoteApplication<M extends BaseRemoteApplication<M>>
 		return getStr("status");
 	}
 
-	public void setCreatedAt(java.util.Date createdAt) {
-		set("createdAt", createdAt);
-	}
-	
-	public java.util.Date getCreatedAt() {
-		return get("createdAt");
-	}
-
 	public void setApplicationDesc(java.lang.String applicationDesc) {
 		set("application_desc", applicationDesc);
 	}
@@ -169,12 +265,116 @@ public abstract class BaseRemoteApplication<M extends BaseRemoteApplication<M>>
 		return getStr("attachment");
 	}
 
-	public void setReportStatus(java.lang.String reportStatus) {
-		set("report_status", reportStatus);
+	public void setRemoteDepartment(java.lang.String remoteDepartment) {
+		set("remote_department", remoteDepartment);
 	}
 	
-	public java.lang.String getReportStatus() {
-		return getStr("report_status");
+	public java.lang.String getRemoteDepartment() {
+		return getStr("remote_department");
+	}
+
+	public void setMore(java.lang.String more) {
+		set("more", more);
+	}
+	
+	public java.lang.String getMore() {
+		return getStr("more");
+	}
+
+	public void setOddNumber(java.lang.String oddNumber) {
+		set("odd_number", oddNumber);
+	}
+	
+	public java.lang.String getOddNumber() {
+		return getStr("odd_number");
+	}
+
+	public void setPayStatus(java.lang.String payStatus) {
+		set("pay_status", payStatus);
+	}
+	
+	public java.lang.String getPayStatus() {
+		return getStr("pay_status");
+	}
+
+	public void setBirthday(java.lang.String birthday) {
+		set("birthday", birthday);
+	}
+	
+	public java.lang.String getBirthday() {
+		return getStr("birthday");
+	}
+
+	public void setCardNum(java.lang.String cardNum) {
+		set("card_num", cardNum);
+	}
+	
+	public java.lang.String getCardNum() {
+		return getStr("card_num");
+	}
+
+	public void setBodyPart(java.lang.String bodyPart) {
+		set("body_part", bodyPart);
+	}
+	
+	public java.lang.String getBodyPart() {
+		return getStr("body_part");
+	}
+
+	public void setExamSubClass(java.lang.String examSubClass) {
+		set("exam_sub_class", examSubClass);
+	}
+	
+	public java.lang.String getExamSubClass() {
+		return getStr("exam_sub_class");
+	}
+
+	public void setStudyId(java.lang.String studyId) {
+		set("study_id", studyId);
+	}
+	
+	public java.lang.String getStudyId() {
+		return getStr("study_id");
+	}
+
+	public void setPhone(java.lang.String phone) {
+		set("phone", phone);
+	}
+	
+	public java.lang.String getPhone() {
+		return getStr("phone");
+	}
+
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
+	public void setSid(java.lang.Long sid) {
+		set("sid", sid);
+	}
+	
+	public java.lang.Long getSid() {
+		return getLong("sid");
+	}
+
+	public void setScid(java.lang.Long scid) {
+		set("scid", scid);
+	}
+	
+	public java.lang.Long getScid() {
+		return getLong("scid");
 	}
 
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseReport.java

@@ -17,6 +17,30 @@ public abstract class BaseReport<M extends BaseReport<M>> extends Model<M> imple
 		return getStr("id");
 	}
 
+	public void setExamId(java.lang.String examId) {
+		set("exam_id", examId);
+	}
+	
+	public java.lang.String getExamId() {
+		return getStr("exam_id");
+	}
+
+	public void setReportDoctorId(java.lang.String reportDoctorId) {
+		set("report_doctor_id", reportDoctorId);
+	}
+	
+	public java.lang.String getReportDoctorId() {
+		return getStr("report_doctor_id");
+	}
+
+	public void setReportDoctorName(java.lang.String reportDoctorName) {
+		set("report_doctor_name", reportDoctorName);
+	}
+	
+	public java.lang.String getReportDoctorName() {
+		return getStr("report_doctor_name");
+	}
+
 	public void setReportDatetime(java.util.Date reportDatetime) {
 		set("report_datetime", reportDatetime);
 	}
@@ -25,100 +49,100 @@ public abstract class BaseReport<M extends BaseReport<M>> extends Model<M> imple
 		return get("report_datetime");
 	}
 
-	public void setDescription(java.lang.String description) {
-		set("description", description);
+	public void setReviewDoctorId(java.lang.String reviewDoctorId) {
+		set("review_doctor_id", reviewDoctorId);
 	}
 	
-	public java.lang.String getDescription() {
-		return getStr("description");
+	public java.lang.String getReviewDoctorId() {
+		return getStr("review_doctor_id");
 	}
 
-	public void setImpression(java.lang.String impression) {
-		set("impression", impression);
+	public void setReviewDoctorName(java.lang.String reviewDoctorName) {
+		set("review_doctor_name", reviewDoctorName);
 	}
 	
-	public java.lang.String getImpression() {
-		return getStr("impression");
+	public java.lang.String getReviewDoctorName() {
+		return getStr("review_doctor_name");
 	}
 
-	public void setImgUrl(java.lang.String imgUrl) {
-		set("img_url", imgUrl);
+	public void setReviewDatetime(java.util.Date reviewDatetime) {
+		set("review_datetime", reviewDatetime);
 	}
 	
-	public java.lang.String getImgUrl() {
-		return getStr("img_url");
+	public java.util.Date getReviewDatetime() {
+		return get("review_datetime");
 	}
 
-	public void setExamId(java.lang.String examId) {
-		set("exam_id", examId);
+	public void setConfirmDoctorId(java.lang.String confirmDoctorId) {
+		set("confirm_doctor_id", confirmDoctorId);
 	}
 	
-	public java.lang.String getExamId() {
-		return getStr("exam_id");
+	public java.lang.String getConfirmDoctorId() {
+		return getStr("confirm_doctor_id");
 	}
 
-	public void setCreatedAt(java.util.Date createdAt) {
-		set("createdAt", createdAt);
+	public void setConfirmDoctorName(java.lang.String confirmDoctorName) {
+		set("confirm_doctor_name", confirmDoctorName);
 	}
 	
-	public java.util.Date getCreatedAt() {
-		return get("createdAt");
+	public java.lang.String getConfirmDoctorName() {
+		return getStr("confirm_doctor_name");
 	}
 
-	public void setReportDoctorId(java.lang.String reportDoctorId) {
-		set("report_doctor_id", reportDoctorId);
+	public void setConfirmDatetime(java.util.Date confirmDatetime) {
+		set("confirm_datetime", confirmDatetime);
 	}
 	
-	public java.lang.String getReportDoctorId() {
-		return getStr("report_doctor_id");
+	public java.util.Date getConfirmDatetime() {
+		return get("confirm_datetime");
 	}
 
-	public void setReviewDoctorId(java.lang.String reviewDoctorId) {
-		set("review_doctor_id", reviewDoctorId);
+	public void setDescription(java.lang.String description) {
+		set("description", description);
 	}
 	
-	public java.lang.String getReviewDoctorId() {
-		return getStr("review_doctor_id");
+	public java.lang.String getDescription() {
+		return getStr("description");
 	}
 
-	public void setQrCode(java.lang.String qrCode) {
-		set("qr_code", qrCode);
+	public void setImpression(java.lang.String impression) {
+		set("impression", impression);
 	}
 	
-	public java.lang.String getQrCode() {
-		return getStr("qr_code");
+	public java.lang.String getImpression() {
+		return getStr("impression");
 	}
 
-	public void setReportResult(java.lang.String reportResult) {
-		set("report_result", reportResult);
+	public void setDiagnose(java.lang.String diagnose) {
+		set("diagnose", diagnose);
 	}
 	
-	public java.lang.String getReportResult() {
-		return getStr("report_result");
+	public java.lang.String getDiagnose() {
+		return getStr("diagnose");
 	}
 
-	public void setReviewDatetime(java.util.Date reviewDatetime) {
-		set("review_datetime", reviewDatetime);
+	public void setQrCode(java.lang.String qrCode) {
+		set("qr_code", qrCode);
 	}
 	
-	public java.util.Date getReviewDatetime() {
-		return get("review_datetime");
+	public java.lang.String getQrCode() {
+		return getStr("qr_code");
 	}
 
-	public void setConfirmDoctorId(java.lang.String confirmDoctorId) {
-		set("confirm_doctor_id", confirmDoctorId);
+	public void setReportResult(java.lang.String reportResult) {
+		set("report_result", reportResult);
 	}
 	
-	public java.lang.String getConfirmDoctorId() {
-		return getStr("confirm_doctor_id");
+	public java.lang.String getReportResult() {
+		return getStr("report_result");
 	}
 
-	public void setConfirmDatetime(java.util.Date confirmDatetime) {
-		set("confirm_datetime", confirmDatetime);
+	public void setRemoteApplicationId(java.lang.String remoteApplicationId) {
+		set("remote_application_id", remoteApplicationId);
 	}
 	
-	public java.util.Date getConfirmDatetime() {
-		return get("confirm_datetime");
+	public java.lang.String getRemoteApplicationId() {
+		return getStr("remote_application_id");
 	}
 
 	public void setType(java.lang.String type) {
@@ -129,12 +153,20 @@ public abstract class BaseReport<M extends BaseReport<M>> extends Model<M> imple
 		return getStr("type");
 	}
 
-	public void setRemoteApplicationId(java.lang.String remoteApplicationId) {
-		set("remote_application_id", remoteApplicationId);
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
 	}
 	
-	public java.lang.String getRemoteApplicationId() {
-		return getStr("remote_application_id");
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
 	}
 
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseReportRecord.java

@@ -41,14 +41,6 @@ public abstract class BaseReportRecord<M extends BaseReportRecord<M>> extends Mo
 		return getStr("report_id");
 	}
 
-	public void setCreatedAt(java.util.Date createdAt) {
-		set("createdAt", createdAt);
-	}
-	
-	public java.util.Date getCreatedAt() {
-		return get("createdAt");
-	}
-
 	public void setDoctorId(java.lang.String doctorId) {
 		set("doctor_id", doctorId);
 	}
@@ -65,4 +57,28 @@ public abstract class BaseReportRecord<M extends BaseReportRecord<M>> extends Mo
 		return getStr("type");
 	}
 
+	public void setReportResult(java.lang.String reportResult) {
+		set("report_result", reportResult);
+	}
+	
+	public java.lang.String getReportResult() {
+		return getStr("report_result");
+	}
+
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseUserBind.java

@@ -1,76 +0,0 @@
-package com.zskk.model.base;
-
-import com.jfinal.plugin.activerecord.Model;
-import com.jfinal.plugin.activerecord.IBean;
-
-/**
- * Generated by JFinal, do not modify this file.
- */
-@SuppressWarnings("serial")
-public abstract class BaseUserBind<M extends BaseUserBind<M>> extends Model<M> implements IBean {
-
-	public void setId(java.lang.Integer id) {
-		set("id", id);
-	}
-	
-	public java.lang.Integer getId() {
-		return getInt("id");
-	}
-
-	public void setUserId(java.lang.String userId) {
-		set("user_id", userId);
-	}
-	
-	public java.lang.String getUserId() {
-		return getStr("user_id");
-	}
-
-	public void setExamId(java.lang.String examId) {
-		set("exam_id", examId);
-	}
-	
-	public java.lang.String getExamId() {
-		return getStr("exam_id");
-	}
-
-	public void setPatientId(java.lang.String patientId) {
-		set("patient_id", patientId);
-	}
-	
-	public java.lang.String getPatientId() {
-		return getStr("patient_id");
-	}
-
-	public void setStorageEndtime(java.util.Date storageEndtime) {
-		set("storage_endtime", storageEndtime);
-	}
-	
-	public java.util.Date getStorageEndtime() {
-		return get("storage_endtime");
-	}
-
-	public void setBindWay(java.lang.Integer bindWay) {
-		set("bind_way", bindWay);
-	}
-	
-	public java.lang.Integer getBindWay() {
-		return getInt("bind_way");
-	}
-
-	public void setStatus(java.lang.Integer status) {
-		set("status", status);
-	}
-	
-	public java.lang.Integer getStatus() {
-		return getInt("status");
-	}
-
-	public void setCreateAt(java.util.Date createAt) {
-		set("createAt", createAt);
-	}
-	
-	public java.util.Date getCreateAt() {
-		return get("createAt");
-	}
-
-}

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseUser.java → PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseUserWechat.java

@@ -7,7 +7,7 @@ import com.jfinal.plugin.activerecord.IBean;
  * Generated by JFinal, do not modify this file.
  */
 @SuppressWarnings("serial")
-public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implements IBean {
+public abstract class BaseUserWechat<M extends BaseUserWechat<M>> extends Model<M> implements IBean {
 
 	public void setId(java.lang.String id) {
 		set("id", id);
@@ -81,4 +81,20 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return get("createAt");
 	}
 
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/model/base/BaseWechatBind.java

@@ -17,52 +17,44 @@ public abstract class BaseWechatBind<M extends BaseWechatBind<M>> extends Model<
 		return getInt("id");
 	}
 
-	public void setUid(java.lang.String uid) {
-		set("uid", uid);
+	public void setUserId(java.lang.String userId) {
+		set("user_id", userId);
 	}
 	
-	public java.lang.String getUid() {
-		return getStr("uid");
+	public java.lang.String getUserId() {
+		return getStr("user_id");
 	}
 
-	public void setPatientName(java.lang.String patientName) {
-		set("patientName", patientName);
+	public void setExamId(java.lang.String examId) {
+		set("exam_id", examId);
 	}
 	
-	public java.lang.String getPatientName() {
-		return getStr("patientName");
+	public java.lang.String getExamId() {
+		return getStr("exam_id");
 	}
 
-	public void setPatientCode(java.lang.String patientCode) {
-		set("patientCode", patientCode);
+	public void setPatientId(java.lang.String patientId) {
+		set("patient_id", patientId);
 	}
 	
-	public java.lang.String getPatientCode() {
-		return getStr("patientCode");
+	public java.lang.String getPatientId() {
+		return getStr("patient_id");
 	}
 
-	public void setIdcard(java.lang.String idcard) {
-		set("idcard", idcard);
+	public void setStorageEndtime(java.util.Date storageEndtime) {
+		set("storage_endtime", storageEndtime);
 	}
 	
-	public java.lang.String getIdcard() {
-		return getStr("idcard");
+	public java.util.Date getStorageEndtime() {
+		return get("storage_endtime");
 	}
 
-	public void setPhone(java.lang.String phone) {
-		set("phone", phone);
+	public void setBindWay(java.lang.Integer bindWay) {
+		set("bind_way", bindWay);
 	}
 	
-	public java.lang.String getPhone() {
-		return getStr("phone");
-	}
-
-	public void setCtime(java.lang.Integer ctime) {
-		set("ctime", ctime);
-	}
-	
-	public java.lang.Integer getCtime() {
-		return getInt("ctime");
+	public java.lang.Integer getBindWay() {
+		return getInt("bind_way");
 	}
 
 	public void setStatus(java.lang.Integer status) {
@@ -73,4 +65,28 @@ public abstract class BaseWechatBind<M extends BaseWechatBind<M>> extends Model<
 		return getInt("status");
 	}
 
+	public void setCreateAt(java.util.Date createAt) {
+		set("createAt", createAt);
+	}
+	
+	public java.util.Date getCreateAt() {
+		return get("createAt");
+	}
+
+	public void setCreatedAt(java.util.Date createdAt) {
+		set("createdAt", createdAt);
+	}
+	
+	public java.util.Date getCreatedAt() {
+		return get("createdAt");
+	}
+
+	public void setUpdatedAt(java.util.Date updatedAt) {
+		set("updatedAt", updatedAt);
+	}
+	
+	public java.util.Date getUpdatedAt() {
+		return get("updatedAt");
+	}
+
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/service/UserService.java

@@ -3,24 +3,15 @@ package com.zskk.service;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.HashKit;
-import com.jfinal.kit.HttpKit;
-import com.jfinal.kit.PropKit;
-import com.jfinal.plugin.activerecord.Record;
 import com.zskk.model.Exams;
-import com.zskk.model.User;
-import com.zskk.model.UserBind;
-
-import okhttp3.ConnectionSpec;
+import com.zskk.model.UserWechat;
+import com.zskk.model.WechatBind;
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -39,41 +30,41 @@ public class UserService {
 	 * 
 	 * @param openid
 	 */
-	public User createWxUserByGH(String openid, String gh) {
-		User user = new User();
-		user.setId(creatId());
-		user.setWxOpenid(openid);
+	public UserWechat createWxUserByGH(String openid, String gh) {
+		UserWechat userWechat = new UserWechat();
+		userWechat.setId(creatId());
+		userWechat.setWxOpenid(openid);
 		switch (gh) {
 
 		case "gh_befaf7c0fbaf":
-			user.setSource("中世康恺电子胶片平台");
+			userWechat.setSource("中世康恺电子胶片平台");
 			break;
 			
 		case "gh_728267809f40":
-			user.setSource("测试微信");
+			userWechat.setSource("测试微信");
 			break;
 
 		case "gh_c3ecc9e4d6e4":
-			user.setSource("黑龙江省电子胶片平台");
+			userWechat.setSource("黑龙江省电子胶片平台");
 			break;
 
 		case "gh_bb923a0a951e":
-			user.setSource("辽宁省电子胶片平台");
+			userWechat.setSource("辽宁省电子胶片平台");
 			break;
 			
 		case "gh_86f660382632":
-			user.setSource("河南省电子胶片平台");
+			userWechat.setSource("河南省电子胶片平台");
 			break;
 
 		default:
-			user.setSource("测试微信");
+			userWechat.setSource("测试微信");
 			break;
 		}
-		user.setWxIcon("");
-		user.setSubscribeStatus(2);
-		user.setCreateAt(new Date());
-		user.save();
-		return user;
+		userWechat.setWxIcon("");
+		userWechat.setSubscribeStatus(2);
+		userWechat.setCreateAt(new Date());
+		userWechat.save();
+		return userWechat;
 	}
 
 	/**
@@ -81,8 +72,8 @@ public class UserService {
 	 * 
 	 * @param openid
 	 */
-	public User createWxUserByAppid(String openid, String appid) {
-		User user = new User();
+	public UserWechat createWxUserByAppid(String openid, String appid) {
+		UserWechat user = new UserWechat();
 		user.setId(creatId());
 		user.setWxOpenid(openid);
 		switch (appid) {
@@ -119,16 +110,16 @@ public class UserService {
 	 * 
 	 * @param openid
 	 */
-	public UserBind bindUserReport(String uid, Exams exam) {
-		UserBind userBind = new UserBind();
-		userBind.setUserId(uid);
-		userBind.setExamId(exam.getId());
-		userBind.setPatientId(exam.getPatientId());
-		userBind.setCreateAt(new Date());
-		userBind.setBindWay(1);
-		userBind.setStatus(1);
-		userBind.save();
-		return userBind;
+	public WechatBind bindUserReport(String uid, Exams exam) {
+		WechatBind wechatBind = new WechatBind();
+		wechatBind.setUserId(uid);
+		wechatBind.setExamId(exam.getId());
+		wechatBind.setPatientId(exam.getPatientId());
+		wechatBind.setCreateAt(new Date());
+		wechatBind.setBindWay(1);
+		wechatBind.setStatus(1);
+		wechatBind.save();
+		return wechatBind;
 	}
 
 	/*
@@ -274,72 +265,72 @@ public class UserService {
 	}
 	
 
-	public static void main(String[] args) throws IOException {
-//		        .url("http://wechat.pacsonline.cn/wx_patient/api/getQrcode?reportId=7e7a4cc7c93b4d2b")
-
-//	    String response = run("http://www.baidu.com");
-//	    System.out.println(response);
-		
-			
-		Map<String, String> data = new HashMap<String, String>();
-		//医院id
-        data.put("hospital_id","15700002");
-        //影像所见
-        data.put("description","test");
-        //意见建议
-        data.put("impression","test");
-        //检查id
-        data.put("exam_id","116f463f179cd343ooo");
-        //患者id
-        data.put("patient_id","116f463f176844f7");
-        data.put("study_id","116f463f176c89a9");
-
-        //患者姓名
-        data.put("patient_name","zhangsan");
-        //患者性别
-        data.put("patient_sex","男");
-        //身份证号
-        data.put("card_num","");
-        //手机号
-        data.put("phone","");
-        //患者生日
-        data.put("birthday","");
-        //患者检查时年龄
-        data.put("patient_age","36");
-        //阴阳性 1阴性 2阳性
-        data.put("report_result","");
-        //报告时间 10位时间戳
-        data.put("report_datetime",String.valueOf(getSecondTimestamp(new Date())));
-        //报告医生id
-        data.put("report_doctor_id","");
-        //报告医生姓名
-        data.put("report_doctor_name","lisi");
-        //审核时间
-        data.put("review_datetime",String.valueOf(getSecondTimestamp(new Date())));
-        //审核医生id
-        data.put("review_doctor_id","");
-        //审核姓名
-        data.put("review_doctor_name","lisi");
-        //确认时间
-        data.put("confirm_datetime", String.valueOf(getSecondTimestamp(new Date())));
-        //确认医生id
-        data.put("confirm_doctor_id", "");
-        //确认医生姓名
-        data.put("confirm_doctor_name","wangwu");
-		System.out.println(data);
-
-		String jString = "{\"birthdate\":\"1964-05-09 00:00:00\",\"modality\":\"MR\",\"patientid\":\"030418249\",\"patientsex\":\"女\",\"reportPaperNum\":740168,\"reportdate\":\"2020-01-08 10:33:30\",\"diagnosis\":\"宫颈ca术后\",\"accessionNumber\":\"17772\",\"patientname\":\"金淑坤\",\"symptom\":\"宫颈ca术后二年余复查\",\"clinicaldoctor\":\"郑鑫\",\"phone\":\"15946362662\",\"DESCRIPTION\":\"   盆腔呈术后改变，子宫缺如。阴道断端未见明确肿瘤信号影，增强扫描未见明显异常强化。膀胱充盈尚可，壁尚光滑。盆腔内未见明确肿大淋巴结。未见盆腔积液。左侧骶骨可见小片状异常信号影，T1WI呈低信号，T2脂肪抑制呈稍高信号，增强扫描呈轻度强化，大小约为1.0*0.4cm。\\r\\n\\r\\n\",\"printreport\":false,\"idcard\":\"231025196405090621\",\"patientage\":\"55岁\",\"impression\":\"1、盆腔呈子宫术后改变，局部未见明确复发征象，建议定期复查。\\r\\n2、左侧骶骨小片状异常强化灶，请追随。\\r\\n\",\"regPaperNum\":\"893058\",\"reviewdoctor\":\"杨滨\",\"department\":\"妇瘤一科\",\"studyuid\":\"17772\",\"printfilm\":false,\"reportdoctor\":\"刘媛\"}";
-	 Map maps = (Map)JSON.parse(jString);  
-     System.out.println("这个是用JSON类来解析JSON字符串!!!");  
-     for (Object map : maps.entrySet()){  
-         System.out.println(((Map.Entry)map).getKey()+"     " + ((Map.Entry)map).getValue());  
-     }     
-		String jsonObject = JSON.toJSONString(data);
-		System.out.println(jsonObject);
-		JSONObject record = JSON.parseObject(jString);
-		String dString  = record.getString("PATIENTAGE");
-
-		post2(null, maps);
-		
-	}
+//	public static void main(String[] args) throws IOException {
+////		        .url("http://wechat.pacsonline.cn/wx_patient/api/getQrcode?reportId=7e7a4cc7c93b4d2b")
+//
+////	    String response = run("http://www.baidu.com");
+////	    System.out.println(response);
+//		
+//			
+//		Map<String, String> data = new HashMap<String, String>();
+//		//医院id
+//        data.put("hospital_id","15700002");
+//        //影像所见
+//        data.put("description","test");
+//        //意见建议
+//        data.put("impression","test");
+//        //检查id
+//        data.put("exam_id","116f463f179cd343ooo");
+//        //患者id
+//        data.put("patient_id","116f463f176844f7");
+//        data.put("study_id","116f463f176c89a9");
+//
+//        //患者姓名
+//        data.put("patient_name","zhangsan");
+//        //患者性别
+//        data.put("patient_sex","男");
+//        //身份证号
+//        data.put("card_num","");
+//        //手机号
+//        data.put("phone","");
+//        //患者生日
+//        data.put("birthday","");
+//        //患者检查时年龄
+//        data.put("patient_age","36");
+//        //阴阳性 1阴性 2阳性
+//        data.put("report_result","");
+//        //报告时间 10位时间戳
+//        data.put("report_datetime",String.valueOf(getSecondTimestamp(new Date())));
+//        //报告医生id
+//        data.put("report_doctor_id","");
+//        //报告医生姓名
+//        data.put("report_doctor_name","lisi");
+//        //审核时间
+//        data.put("review_datetime",String.valueOf(getSecondTimestamp(new Date())));
+//        //审核医生id
+//        data.put("review_doctor_id","");
+//        //审核姓名
+//        data.put("review_doctor_name","lisi");
+//        //确认时间
+//        data.put("confirm_datetime", String.valueOf(getSecondTimestamp(new Date())));
+//        //确认医生id
+//        data.put("confirm_doctor_id", "");
+//        //确认医生姓名
+//        data.put("confirm_doctor_name","wangwu");
+//		System.out.println(data);
+//
+//		String jString = "{\"birthdate\":\"1964-05-09 00:00:00\",\"modality\":\"MR\",\"patientid\":\"030418249\",\"patientsex\":\"女\",\"reportPaperNum\":740168,\"reportdate\":\"2020-01-08 10:33:30\",\"diagnosis\":\"宫颈ca术后\",\"accessionNumber\":\"17772\",\"patientname\":\"金淑坤\",\"symptom\":\"宫颈ca术后二年余复查\",\"clinicaldoctor\":\"郑鑫\",\"phone\":\"15946362662\",\"DESCRIPTION\":\"   盆腔呈术后改变，子宫缺如。阴道断端未见明确肿瘤信号影，增强扫描未见明显异常强化。膀胱充盈尚可，壁尚光滑。盆腔内未见明确肿大淋巴结。未见盆腔积液。左侧骶骨可见小片状异常信号影，T1WI呈低信号，T2脂肪抑制呈稍高信号，增强扫描呈轻度强化，大小约为1.0*0.4cm。\\r\\n\\r\\n\",\"printreport\":false,\"idcard\":\"231025196405090621\",\"patientage\":\"55岁\",\"impression\":\"1、盆腔呈子宫术后改变，局部未见明确复发征象，建议定期复查。\\r\\n2、左侧骶骨小片状异常强化灶，请追随。\\r\\n\",\"regPaperNum\":\"893058\",\"reviewdoctor\":\"杨滨\",\"department\":\"妇瘤一科\",\"studyuid\":\"17772\",\"printfilm\":false,\"reportdoctor\":\"刘媛\"}";
+//	 Map maps = (Map)JSON.parse(jString);  
+//     System.out.println("这个是用JSON类来解析JSON字符串!!!");  
+//     for (Object map : maps.entrySet()){  
+//         System.out.println(((Map.Entry)map).getKey()+"     " + ((Map.Entry)map).getValue());  
+//     }     
+//		String jsonObject = JSON.toJSONString(data);
+//		System.out.println(jsonObject);
+//		JSONObject record = JSON.parseObject(jString);
+//		String dString  = record.getString("PATIENTAGE");
+//
+//		post2(null, maps);
+//		
+//	}
 }

PacsOnline_Wechat_Patient/src/main/java/com/zskk/service/WeixinService.java

@@ -24,7 +24,7 @@ import com.jfinal.weixin.sdk.api.SnsApi;
 import com.jfinal.weixin.sdk.api.TemplateData;
 import com.jfinal.weixin.sdk.api.TemplateMsgApi;
 import com.jfinal.weixin.sdk.api.JsTicketApi.JsApiType;
-import com.zskk.model.User;
+import com.zskk.model.UserWechat;
 import com.zskk.service.bean.WxJSConfigBean;
 
 public class WeixinService {
@@ -149,10 +149,10 @@ public class WeixinService {
 	 */
 	public ApiResult getWebWeixinUserInfo(String accessToken, String openId) {
 		ApiResult apiResult = SnsApi.getUserInfo(accessToken, openId);
-		User user = User.dao.findFirst("select * from user where wx_openid=?",openId);
-		user.setWxIcon(apiResult.getStr("headimgurl"));
-		user.setWxNickname(apiResult.getStr("nickname"));
-		user.update();
+		UserWechat userWechat = UserWechat.dao.findFirst("select * from user_wechat where wx_openid=?",openId);
+		userWechat.setWxIcon(apiResult.getStr("headimgurl"));
+		userWechat.setWxNickname(apiResult.getStr("nickname"));
+		userWechat.update();
 		return apiResult;
 	}
 	

PacsOnline_Wechat_Patient/src/main/java/com/zskk/util/_JFinalDemoGenerator.java

@@ -46,7 +46,7 @@ public class _JFinalDemoGenerator {
 		generator.setGenerateChainSetter(false);
 		
 		// 添加不需要生成的表名
-		generator.addExcludedTable("bbs","sys_logs","bodypart","constant","department","device","doctor_class","doctors","dr_cla_permission","exam_class","exam_project","exam_subclass","images","manager","menu","templates","studies","series","oss_callbacks","version","sys_menus");
+		generator.addExcludedTable("bbs","sys_logs","bodypart","constant","department","device","doctor_class","doctors","dr_cla_permission","exam_class","exam_project","exam_subclass","images","manager","menu","templates","studies","series","oss_callbacks","version","sys_menus","api","default_cost","every_studies","fa_admin","fa_admin_log","fa_area","fa_attachment","fa_auth_group","fa_auth_group_access","fa_auth_institution_access","fa_auth_rule","fa_category","fa_config","fa_ems","fa_sms","fa_test","fa_user","fa_user_group","fa_user_money_log","fa_user_rule","fa_user_score_log","fa_user_token","fa_version","lcoss_callbacks","log","patient_exam","register","remote_contact","remote_cost","remote_order","remote_water","remote_water_log","send_message","special_contact","special_remote","wechat_pay_log","wechat_refund_log","xz","user_bind");
 		
 		// 设置是否在 Model 中生成 dao 对象
 		generator.setGenerateDaoInModel(true);