commit

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -71,9 +71,9 @@ public class ZskkConfig extends JFinalConfig {
 //		arpConnected.setDialect(new OracleDialect());
 //		me.add(arpConnected);
 		
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/5 * * * *", new DataTask());
-		me.add(cpData);
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/5 * * * *", new DataTask());
+//		me.add(cpData);
 
 //		Cron4jPlugin cp2 = new Cron4jPlugin();
 //		cp2.addTask("*/3 * * * *", new SyncTask2());

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

@@ -39,6 +39,7 @@ import com.zskk.model.Exams;
 import com.zskk.model.PatientInfos;
 import com.zskk.model.Report;
 import com.zskk.model.Studies;
+import com.zskk.tools.XmlHelper;
 
 public class ViewController extends Controller {
 
@@ -89,43 +90,72 @@ public class ViewController extends Controller {
 	
 	public void testTask() {
 		try {
-			//List<Record>  d =  Db.use("connected").find(this.getPara("sqlStr"));
-			List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=73090001 order by createdAt desc limit 50");
-			List<Record> examds = new ArrayList<>();
+			List<Exams> exams = Exams.dao.use("zskk").find("SELECT * FROM pacsonline.exams where exam_status=3 and institution_id=73090006 order by createdAt desc limit 100");
 			for (Exams exams2 : exams) {
 				Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
-				Record record = Db.use("connected").findFirst("select * from caller where STUDYUID=?",studies.getStudyuid());
-				if (record == null) {
+//				WeixinService wService = ServiceFactory.getService(WeixinService.class);
+//				wService.requestWeixinQrcode(report.getId());
+				Map headerString = new HashMap();
+				headerString.put("Content-Type","text/xml");
+				String content = HttpKit.post("http://10.84.138.254:8080/rest/getReportByStudyuid", getXmlInfo(studies.getStudyuid()), headerString);
+			    XmlHelper xmlHelper = XmlHelper.of(content);
+				
+			    Report report = new Report().use("zskk");
+				report.setId(creatId());
+				report.setReportDatetime(parseStringToDate(xmlHelper.getString("//ReportBean[1]/reportdate")));
+				if (!xmlHelper.getString("//ReportBean[1]/reportdate").equals("0")) {
 					continue;
 				}
-				examds.add(record);
-				Report report = new Report().use("zskk");
-				report.setId(creatId());
-				report.setReportDatetime(aaa(record.getStr("REPORTDATE")));
-				report.setImpression(record.getStr("IMPRESSION"));
-				report.setDescription(record.getStr("DESCRIPTION"));
+				report.setImpression(xmlHelper.getString("//ReportBean[1]/impression"));
+				report.setDescription(xmlHelper.getString("//ReportBean[1]/description"));
 				report.setExamId(exams2.getId());
 				report.setCreatedAt(new Date());
-				if (record.getStr("FITEM_RESULT_CODE") != null) {
-					//report.setReportResult(record.getStr("FITEM_RESULT_CODE").contains("阴")?"1":"2");
-				}
-				report.setReportDoctorId(getDoctorIdByName(record.getStr("REPORTDOCTOR")));
-				report.setReviewDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setReviewDatetime(aaa(record.getStr("REPORTDATE")));
-				report.setConfirmDoctorId(getDoctorIdByName(record.getStr("REVIEWDOCTOR")));
-				report.setConfirmDatetime(aaa(record.getStr("REPORTDATE")));
-//				report.save();
+				report.setReportDoctorId(getDoctorIdByName(xmlHelper.getString("//ReportBean[1]/reportdoctor")));
+				report.setReviewDoctorId(getDoctorIdByName(xmlHelper.getString("//ReportBean[1]/reviewdoctor")));
+				report.setReviewDatetime(parseStringToDate(xmlHelper.getString("//ReportBean[1]/reportdate")));
+				report.setConfirmDoctorId(getDoctorIdByName(xmlHelper.getString("//ReportBean[1]/reviewdoctor")));
+				report.setConfirmDatetime(parseStringToDate(xmlHelper.getString("//ReportBean[1]/reportdate")));
+				report.save();
 				PatientInfos patientInfos = PatientInfos.dao.use("zskk").findById(exams2.getPatientId());
-				patientInfos.setName(record.getStr("PATIENTNAME"));
-//				patientInfos.update();
+				patientInfos.setName(xmlHelper.getString("//ReportBean[1]/patientname"));
+				patientInfos.setPhone(xmlHelper.getString("//ReportBean[1]/phone"));
+//				patientInfos.setCardNum(record.getStr("IDCARD"));
+				patientInfos.update();
+				exams2.setExamStatus(9);
+				exams2.update();
 			}
-			this.renderJson(examds);
+//			this.renderJson(examds);
 		} catch (Exception e) {
 			// TODO: handle exception
 			this.renderText(e.toString());
 		}
 	}
 	
+	private String getXmlInfo(String studyuid) {  
+        StringBuilder sb = new StringBuilder();  
+        sb.append("<request>");  
+        sb.append("<studyuid>");  
+        sb.append(studyuid);   
+        sb.append("</studyuid>");   
+        sb.append("</request>");  
+        return sb.toString();  
+        
+    } 
+	
+	private Date parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return new Date();
+		}
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = null;
+		try {
+			date = sdf.parse(dateStr);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return date;
+	}
 	private String creatId() {
 		UUID id = UUID.randomUUID();
         String[] idd =id.toString().split("-");