diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml index cdf2b66..d2c5cfa 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterRis.xml @@ -4,55 +4,147 @@ INSERT INTO ris_report_info( - R_ID, - TITLE, - TYPE, - VCCARDNO, - NAME, - BHNUM, - PHONE, - AGE, - SEX, - IMGS, - ITEM_FINDING, - ITEM_DIAGNOSIS, - ITEM_RESULT, - APPLY_TIME, - CHECK_TIME, - PUBLISH_TIME, - APPLY_DOCTOR, - APPLY_DEPT, - CHECKER, - MODIFIED, - CREATED, - HOSPITAL_ID, - ITEM_JSON + + R_ID, + + + TITLE, + + + TYPE, + + + VCCARDNO, + + + NAME, + + + BHNUM, + + + phone, + + + AGE, + + + SEX, + + + IMGS, + + + ITEM_FINDING, + + + ITEM_DIAGNOSIS, + + + ITEM_RESULT, + + + APPLY_TIME, + + + CHECK_TIME, + + + PUBLISH_TIME, + + + APPLY_DOCTOR, + + + APPLY_DEPT, + + + CHECKER, + + + MODIFIED, + + + CREATED, + + + HOSPITAL_ID, + + + ITEM_JSON + + ) VALUES ( - ${r_id}, - ${title}, - ${type}, - ${vccardno}, - ${name}, - ${bhnum}, - ${phone}, - ${age}, - ${sex}, - ${imgs}, - ${item_finding}, - ${item_diagnosis}, - ${item_result}, - ${apply_time}, - ${check_time}, - ${publish_time}, - ${apply_doctor}, - ${apply_dept}, - ${checker}, - ${modified}, - ${created}, - ${hospital_id}, - ${item_json} + + #{r_id}, + + + #{title}, + + + #{type}, + + + #{vccardno}, + + + #{name}, + + + #{bhnum}, + + + #{phone}, + + + #{age}, + + + #{sex}, + + + #{imgs}, + + + #{item_finding}, + + + #{item_diagnosis}, + + + #{item_result}, + + + #{apply_time}, + + + #{check_time}, + + + #{publish_time}, + + + #{apply_doctor}, + + + #{apply_dept}, + + + #{checker}, + + + #{modified}, + + + #{created}, + + + #{hospital_id}, + + + #{item_json} + ) - diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 7befa3e..41f5a9b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1198,7 +1198,7 @@ public class BookbuildingFacade { mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setWxTempId(WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId()); messages.add(mr); - smsConfigFacade.saveMsg(messages, patient.getHospitalId()); + // smsConfigFacade.saveMsg(messages, patient.getHospitalId()); } catch (InterruptedException e) { logger.error("sendbuildingMsg Exception " + e); } @@ -1268,13 +1268,16 @@ public class BookbuildingFacade { } /** - * 秦皇岛二院产检提醒 上午9点推送 + * 秦皇岛二院、大同产检提醒 上午9点推送 */ public void weekSync() { logger.info("weekSync startup"); - final String hospitalId = "1000000016"; + // final String hospitalId = "1000000016"; + List hospitalList=new ArrayList<>(); + hospitalList.add("2100002419"); + hospitalList.add("1000000016"); PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setHospitalId(hospitalId); + patientsQuery.setHospitalList(hospitalList); patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); patientsQuery.setYn(YnEnums.YES.getId()); @@ -1289,15 +1292,15 @@ public class BookbuildingFacade { public void run() { for (int i = 0, j = patientList.size(); i < j; i++) { Patients patients = patientList.get(i); - Map params = getBuildingWeek(patients, Integer.valueOf(hospitalId)); + Map params = getBuildingWeek(patients, Integer.valueOf(patients.getHospitalId())); String week = params.get("dueWeek"); try { if (StringUtils.isNotEmpty(week)) { sendbuildingMsg(patients, SmsServiceEnums.CJYYTX.getId(), "【产检提醒】", "亲爱的孕妈妈,您当前孕周为" + params.get("weekDay") + "。", week); - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId()) && !patients.getRiskFactorId().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { + if ((CollectionUtils.isNotEmpty(patients.getRiskFactorId()) && patients.getRiskFactorId().size()>1 ) ||(!patients.getRiskFactorId().get(0).equals("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) ) { FactorProjectQuery factorProjectQuery = new FactorProjectQuery(); - factorProjectQuery.setHospitalId(Integer.valueOf(hospitalId)); + factorProjectQuery.setHospitalId(Integer.valueOf(patients.getHospitalId())); factorProjectQuery.setWeek(week); factorProjectQuery.setRiskFactorIds(patients.getRiskFactorId()); List projectList = factorProjectService.getList(factorProjectQuery);