更换微信二维码接口，优化录入规则

DataFusion/.classpath

@@ -2,11 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-codec-1.9.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-2.5.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-lang3-3.4.jar"/>
@@ -29,5 +24,10 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/objenesis-2.1.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ojdbc6.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/sqljdbc42.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

DataFusion/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
-org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=10
+org.eclipse.jdt.core.compiler.source=11

DataFusion/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -3,7 +3,7 @@
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="jst.web"/>
-  <installed facet="java" version="10"/>
   <installed facet="jst.web" version="4.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="11"/>
 </faceted-project>

DataFusion/src/com/zskk/control/ViewController.java

@@ -74,11 +74,13 @@ public class ViewController extends Controller {
 				patientInfos.setPhone(record.getStr("PHONE"));
 //				patientInfos.setCardNum(record.getStr("IDCARD"));
 				patientInfos.update();
+				exams2.setClinDiag("DIAGNOSIS");
+				exams2.setClinSymp(record.getStr("SYMPTOM"));
 				exams2.setApplicationDoctor(record.getStr("CLINICALDOCTOR"));
 				exams2.setApplicationDepartment(record.getStr("DEPARTMENT"));
 				exams2.setExamStatus(9);
 				exams2.update();
-				WeixinService wService = ServiceFactory.getService(WeixinService.class);
+				WeixinService wService = new WeixinService();
 				wService.requestWeixinQrcode(report.getId());
 			}
 //			this.renderJson(examds);
@@ -96,30 +98,24 @@ public class ViewController extends Controller {
 	
 	private String getDoctorIdByName(String name) {
 		if (name == null) {
-			return "1";
+			return null;
 		}
-		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=73090001",name);
+		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=74300002 and realname<>null",name);
 		if (doctors == null) {
-			return "1";
+			Doctors newDoctors = new Doctors().use("zskk");
+			newDoctors.setId(creatId());
+			newDoctors.setUsername("none");
+			newDoctors.setRealname(name);
+			newDoctors.setPassword("123456");
+			newDoctors.setInstitutionId("74300002");
+			newDoctors.setCreatedAt(new Date());
+			newDoctors.setUpdatedAt(new Date());
+			newDoctors.save();
+			return newDoctors.getId();
 		}
 		return doctors.getId();
 	}
 	
-	private Date aaa(String timestr) {
-		if (timestr == null) {
-			return new Date();
-		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	    Date date = null;
-		try {
-			date = sdf.parse(timestr);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        return date;
-	}
-	
 	private Date parseStringToDate(String dateStr) {
 		if (dateStr == null) {
 			return new Date();

DataFusion/src/com/zskk/service/WeixinService.java

@@ -24,7 +24,7 @@ public class WeixinService {
 	private static final String CAHR_CODE = "UTF-8";
 
 	// 获取访问TOKEN
-	private static final String WEIXIN_QRCODE = "http://wechat.pacsonline.cn/wxzskk/uwx/requestWxQrcode?reportId=%s";
+	private static final String WEIXIN_QRCODE = "http://wechat.pacsonline.cn/wx_patient/api/unifyGetWxQrcode?reportId=%s";
 
 	/*
 	 * 获取用户信息

DataFusion/src/com/zskk/task/DataTask.java

@@ -8,7 +8,6 @@ import java.util.UUID;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
-import com.zskk.service.ServiceFactory;
 import com.zskk.model.Doctors;
 import com.zskk.model.PatientInfos;
 import com.zskk.model.Report;
@@ -51,11 +50,13 @@ public class DataTask implements ITask {
 				patientInfos.setPhone(record.getStr("PHONE"));
 //				patientInfos.setCardNum(record.getStr("IDCARD"));
 				patientInfos.update();
+				exams2.setClinDiag("DIAGNOSIS");
+				exams2.setClinSymp(record.getStr("SYMPTOM"));
 				exams2.setApplicationDoctor(record.getStr("CLINICALDOCTOR"));
 				exams2.setApplicationDepartment(record.getStr("DEPARTMENT"));
 				exams2.setExamStatus(9);
 				exams2.update();
-				WeixinService wService = ServiceFactory.getService(WeixinService.class);
+				WeixinService wService = new WeixinService();
 				wService.requestWeixinQrcode(report.getId());
 			}
 		} catch (Exception e) {
@@ -81,9 +82,18 @@ public class DataTask implements ITask {
 		if (name == null) {
 			return null;
 		}
-		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=74300002",name);
+		Doctors doctors = Doctors.dao.use("zskk").findFirst("SELECT * FROM doctors where instr(?,realname) and institution_id=74300002 and realname<>null",name);
 		if (doctors == null) {
-			return null;
+			Doctors newDoctors = new Doctors().use("zskk");
+			newDoctors.setId(creatId());
+			newDoctors.setUsername("none");
+			newDoctors.setRealname(name);
+			newDoctors.setPassword("123456");
+			newDoctors.setInstitutionId("74300002");
+			newDoctors.setCreatedAt(new Date());
+			newDoctors.setUpdatedAt(new Date());
+			newDoctors.save();
+			return newDoctors.getId();
 		}
 		return doctors.getId();
 	}