From 402e7cc2fd11c5dc0f20586d4ba7d5af18525f37 Mon Sep 17 00:00:00 2001 From: tranny <1163285868@qq.com> Date: Tue, 8 Dec 2020 14:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/utils/LymsEncodeUtil.java | 6 +-- .../lyms/platform/common/utils/StringUtils.java | 5 ++ .../com/lyms/platform/pojo/PremaritalCheckup.java | 57 ++++++++++++++++++++++ .../msg/worker/BabyAmsMsgGenerateWorker.java | 2 +- .../msg/worker/TempleteMsgGenerateWorker.java | 22 +++++---- .../controller/PremaritalCheckupController.java | 15 ++++++ .../operate/web/controller/TestController.java | 16 ++++++ .../operate/web/facade/PatientServiceFacade.java | 10 ++-- .../web/facade/PremaritalCheckupFacade.java | 32 ++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 11 +++++ .../web/request/PremaritalCheckupAddRequest.java | 56 +++++++++++++++++++++ .../web/result/PremaritalCheckupResult.java | 55 +++++++++++++++++++++ .../operate/web/service/SyncDataTaskService.java | 6 +-- .../web/service/impl/PatientWeightServiceImpl.java | 1 + 14 files changed, 274 insertions(+), 20 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index b27214d..3ff2afd 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -17,7 +17,7 @@ import sun.misc.BASE64Encoder; public class LymsEncodeUtil { public static void main(String[] args) throws Exception { - String key = "Lymsh@2020"; + String key = "Lymsh@2016"; /* * String content = "我爱你"; System.out.println("加密前：" + content); System.out.println("加密密钥和解密密钥：" + key); * @@ -26,8 +26,8 @@ public class LymsEncodeUtil { //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); -// String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB", key); - String json = aesDecrypt("2B9AA35B558087F6C02F46DA9A0C21B5", key); + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB", key); +// String json = aesDecrypt("2B9AA35B558087F6C02F46DA9A0C21B5", key); System.out.println("解密后：" + json); // String key1 = "Lymsh@2020"; diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index b7a647d..6370c52 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -379,4 +379,9 @@ public final class StringUtils { return obj == null ? null : DateUtil.parseYMDHMS(java.lang.String.valueOf(obj)); } + public static String getIntToVal(Integer obj) + { + return obj == null ? null : String.valueOf(obj); + } + } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index bbfde8c..a692d25 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -435,6 +435,63 @@ public class PremaritalCheckup extends BaseModel { //色觉 private String seJue; + + //婚检信息签名 + private String baseSign; + + //体格检查签名 + private String physiqueSign; + + //生殖检查签名 + private String repSign; + + //婚前指导签名 + private String guidSign; + + //用户签名 + private String userSign; + + + public String getBaseSign() { + return baseSign; + } + + public void setBaseSign(String baseSign) { + this.baseSign = baseSign; + } + + public String getPhysiqueSign() { + return physiqueSign; + } + + public void setPhysiqueSign(String physiqueSign) { + this.physiqueSign = physiqueSign; + } + + public String getRepSign() { + return repSign; + } + + public void setRepSign(String repSign) { + this.repSign = repSign; + } + + public String getGuidSign() { + return guidSign; + } + + public void setGuidSign(String guidSign) { + this.guidSign = guidSign; + } + + public String getUserSign() { + return userSign; + } + + public void setUserSign(String userSign) { + this.userSign = userSign; + } + public String getSeJue() { return seJue; } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java index c9d944b..4404938 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java @@ -84,7 +84,7 @@ public class BabyAmsMsgGenerateWorker implements Runnable { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - //babyQuery.setMphone("15230280694"); // 15027805358 17732261179 15930921847 13851409428 13175251837 + babyQuery.setMphone("15833911677"); // 15027805358 17732261179 15930921847 13851409428 13175251837 List buildType = new ArrayList(); buildType.add(1); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 06e4a11..73d188c 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -504,16 +504,20 @@ public class TempleteMsgGenerateWorker implements Runnable { } } else { - BabyModelQuery babyQuery = getBabyModelQuery(template); - babyQuery.setBirthStart(startDate); - babyQuery.setBirthEnd(endDate); - List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + //BabyModelQuery babyQuery = getBabyModelQuery(template); + babyModelQuery.setBirthStart(startDate); + babyModelQuery.setBirthEnd(endDate); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); for (BabyModel babyModel : babyModels){ - HashMap hashMap = getMapByParam(template, babyModel.getId(), true); - List patientServices = patientServiceService.getPatientServices(hashMap); - if (CollectionUtils.isNotEmpty(patientServices)){ - addBabyRemindMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); - } + + addBabyRemindMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); + +// HashMap hashMap = getMapByParam(template, babyModel.getId(), true); +// List patientServices = patientServiceService.getPatientServices(hashMap); +// if (CollectionUtils.isNotEmpty(patientServices)){ +// addBabyRemindMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel); +// } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java index 80a59f5..79fce15 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java @@ -49,6 +49,21 @@ public class PremaritalCheckupController extends BaseController{ } + + @RequestMapping(value = "/addPremaritalCheckupSign", method = RequestMethod.POST) + @ResponseBody + @TokenRequired + public BaseResponse addPremaritalCheckupSign(@RequestBody PremaritalCheckupAddRequest addRequest, + HttpServletRequest request){ +// 获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + + + return premaritalCheckupFacade.addPremaritalCheckupSign(addRequest , loginState.getId()); + } + + + /** * 查询单个婚前检查 * @param vcCardNo 就诊卡 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index f8523ac..28ac29b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -4002,4 +4002,20 @@ public class TestController extends BaseController { @Autowired private PatientWeightService patientWeightService; + @Autowired + private PatientSyncMysqlFacade patientSyncMysqlFacade; + + @ResponseBody + @RequestMapping(value = "/syncPatients", method = RequestMethod.GET) + public String syncPatients() { + patientSyncMysqlFacade.syncPatients(); + return "success"; + } + + @ResponseBody + @RequestMapping(value = "/syncAntexc", method = RequestMethod.GET) + public String syncAntexc() { + patientSyncMysqlFacade.syncAntexc(); + return "success"; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index f3a673c..98f4993 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1249,10 +1249,12 @@ public class PatientServiceFacade { patientServiceService.updatePatientService(service); Patients patients = patientsService.findOnePatientById(service.getParentid()); - patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); - patientsService.updatePatient(patients); - + if (patients != null) + { + patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + patientsService.updatePatient(patients); + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index c7e6d15..298cfa3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -465,6 +465,13 @@ public class PremaritalCheckupFacade { checkupResult.setYuyan(result.getYuyan()); checkupResult.setSeJue(result.getSeJue()); + + checkupResult.setBaseSign(result.getBaseSign()); + checkupResult.setPhysiqueSign(result.getPhysiqueSign()); + checkupResult.setRepSign(result.getRepSign()); + checkupResult.setGuidSign(result.getGuidSign()); + checkupResult.setUserSign(result.getUserSign()); + return checkupResult; } @@ -908,6 +915,13 @@ public class PremaritalCheckupFacade { checkup.setSeJue(addRequest.getSeJue()); + checkup.setBaseSign(addRequest.getBaseSign()); + checkup.setPhysiqueSign(addRequest.getPhysiqueSign()); + checkup.setRepSign(addRequest.getRepSign()); + checkup.setGuidSign(addRequest.getGuidSign()); + checkup.setUserSign(addRequest.getUserSign()); + + /* 基础数据 */ checkup.setYn(YnEnums.YES.getId()); checkup.setModified(new Date()); @@ -2880,4 +2894,22 @@ public class PremaritalCheckupFacade { return hids; } + public BaseResponse addPremaritalCheckupSign(PremaritalCheckupAddRequest addRequest, Integer id) { + + if (StringUtils.isEmpty(addRequest.getId())) + { + return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); + } + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setId(addRequest.getId()); + List dataNan = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(dataNan)) + { + PremaritalCheckup checkup = dataNan.get(0); + checkup.setUserSign(addRequest.getUserSign()); + premaritalCheckupService.updatePremaritalCheckup(checkup,checkup.getId()); + } + + return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index cc402e2..2ad390e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -582,6 +582,7 @@ public class ViewFacade { map.put("createdTime", DateUtil.getyyyy_MM_dd_hms(data.getCreated())); map.put("modifiedTime", DateUtil.getyyyy_MM_dd_hms(data.getCreated())); map.put("type", data.getType()); + map.put("dueStatus", data.getDueStatus()); return map; } @@ -2461,6 +2462,16 @@ public class ViewFacade { map.put("checkResult", data.getCheckResult()); getSelect(data, map); + + + map.put("patientId", data.getParentId()); // + map.put("createdTime", DateUtil.getyyyy_MM_dd_hms(data.getCreated())); + map.put("modifiedTime", DateUtil.getyyyy_MM_dd_hms(data.getModified())); + map.put("pid", data.getPid()); // + map.put("ssy", ssy); // 血压 + map.put("szy", szy); // 血压 + map.put("yn", data.getYn()); // + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index 555ff22..c17b0f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -430,6 +430,62 @@ public class PremaritalCheckupAddRequest { //色觉 private String seJue; + //婚检信息签名 + private String baseSign; + + //体格检查签名 + private String physiqueSign; + + //生殖检查签名 + private String repSign; + + //婚前指导签名 + private String guidSign; + + //用户签名 + private String userSign; + + + public String getBaseSign() { + return baseSign; + } + + public void setBaseSign(String baseSign) { + this.baseSign = baseSign; + } + + public String getPhysiqueSign() { + return physiqueSign; + } + + public void setPhysiqueSign(String physiqueSign) { + this.physiqueSign = physiqueSign; + } + + public String getRepSign() { + return repSign; + } + + public void setRepSign(String repSign) { + this.repSign = repSign; + } + + public String getGuidSign() { + return guidSign; + } + + public void setGuidSign(String guidSign) { + this.guidSign = guidSign; + } + + public String getUserSign() { + return userSign; + } + + public void setUserSign(String userSign) { + this.userSign = userSign; + } + public String getSeJue() { return seJue; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index 2904e1c..c09aba6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -405,6 +405,61 @@ public class PremaritalCheckupResult { //色觉 private String seJue; + //婚检信息签名 + private String baseSign; + + //体格检查签名 + private String physiqueSign; + + //生殖检查签名 + private String repSign; + + //婚前指导签名 + private String guidSign; + + //用户签名 + private String userSign; + + + public String getBaseSign() { + return baseSign; + } + + public void setBaseSign(String baseSign) { + this.baseSign = baseSign; + } + + public String getPhysiqueSign() { + return physiqueSign; + } + + public void setPhysiqueSign(String physiqueSign) { + this.physiqueSign = physiqueSign; + } + + public String getRepSign() { + return repSign; + } + + public void setRepSign(String repSign) { + this.repSign = repSign; + } + + public String getGuidSign() { + return guidSign; + } + + public void setGuidSign(String guidSign) { + this.guidSign = guidSign; + } + + public String getUserSign() { + return userSign; + } + + public void setUserSign(String userSign) { + this.userSign = userSign; + } public String getSeJue() { return seJue; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 466c024..7ac4acf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -167,8 +167,8 @@ public class SyncDataTaskService { { if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals( model.getClassName()) || "26EB0301C4A2410E90985A3E55856E4BD23678A20530C64EC8478C7581BC98073D9BFF0544133E28AB36B23DF4485FB8".equals(model.getClassName()) -// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89") -// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB") + || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89") + || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB") ) { //System.out.println("archiveData="+model.getClassName()); @@ -232,7 +232,7 @@ public class SyncDataTaskService { public static void main(String[] args) { try { - String json = "26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89"; + String json = ""; String data = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016"); data = LymsEncodeUtil.aesDecrypt(data,"Lymsh@2016"); data = new String(data.getBytes("utf-8")); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index c6dfbe0..094b69d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -997,6 +997,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } map.put("week", week); map.put("bregmatic", StringUtils.isNotEmpty(patientWeight.getBregmatic()) ? patientWeight.getBregmatic() : "1"); + map.put("bregmaticOther", StringUtils.isNotEmpty(patientWeight.getBregmaticOther()) ? patientWeight.getBregmaticOther() : ""); map.put("height", StringUtils.isEmpty(patientWeight.getBeforeHeight()) ? "" : patientWeight.getBeforeHeight() + " cm"); map.put("beforeWeight", StringUtils.isEmpty(patientWeight.getBeforeWeight()) ? "" : patientWeight.getBeforeWeight() + " 公斤"); map.put("bmi", patientWeight.getBmi()); -- 1.8.3.1