liquanyu / regional-platform

Download as
Browse Code »

Commit 402e7cc2fd11c5dc0f20586d4ba7d5af18525f37

Authored by tranny
1 parent aeda92ae44
Exists in master and in 1 other branch dev

短信保存

Showing 14 changed files with 274 additions and 20 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 402e7cc
... ... @@ -17,7 +17,7 @@
17 17 public class LymsEncodeUtil {
18 18  
19 19 public static void main(String[] args) throws Exception {
20   - String key = "Lymsh@2020";
  20 + String key = "Lymsh@2016";
21 21 /*
22 22 * String content = "我爱你"; System.out.println("加密前：" + content); System.out.println("加密密钥和解密密钥：" + key);
23 23 *
... ... @@ -26,8 +26,8 @@
26 26  
27 27 //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28 28  
29   -// String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB", key);
30   - String json = aesDecrypt("2B9AA35B558087F6C02F46DA9A0C21B5", key);
  29 + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB", key);
  30 +// String json = aesDecrypt("2B9AA35B558087F6C02F46DA9A0C21B5", key);
31 31 System.out.println("解密后：" + json);
32 32  
33 33 // String key1 = "Lymsh@2020";
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ 402e7cc
... ... @@ -379,5 +379,10 @@
379 379 return obj == null ? null : DateUtil.parseYMDHMS(java.lang.String.valueOf(obj));
380 380 }
381 381  
  382 + public static String getIntToVal(Integer obj)
  383 + {
  384 + return obj == null ? null : String.valueOf(obj);
  385 + }
  386 +
382 387 }
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 402e7cc
... ... @@ -435,6 +435,63 @@
435 435 //色觉
436 436 private String seJue;
437 437  
  438 +
  439 + //婚检信息签名
  440 + private String baseSign;
  441 +
  442 + //体格检查签名
  443 + private String physiqueSign;
  444 +
  445 + //生殖检查签名
  446 + private String repSign;
  447 +
  448 + //婚前指导签名
  449 + private String guidSign;
  450 +
  451 + //用户签名
  452 + private String userSign;
  453 +
  454 +
  455 + public String getBaseSign() {
  456 + return baseSign;
  457 + }
  458 +
  459 + public void setBaseSign(String baseSign) {
  460 + this.baseSign = baseSign;
  461 + }
  462 +
  463 + public String getPhysiqueSign() {
  464 + return physiqueSign;
  465 + }
  466 +
  467 + public void setPhysiqueSign(String physiqueSign) {
  468 + this.physiqueSign = physiqueSign;
  469 + }
  470 +
  471 + public String getRepSign() {
  472 + return repSign;
  473 + }
  474 +
  475 + public void setRepSign(String repSign) {
  476 + this.repSign = repSign;
  477 + }
  478 +
  479 + public String getGuidSign() {
  480 + return guidSign;
  481 + }
  482 +
  483 + public void setGuidSign(String guidSign) {
  484 + this.guidSign = guidSign;
  485 + }
  486 +
  487 + public String getUserSign() {
  488 + return userSign;
  489 + }
  490 +
  491 + public void setUserSign(String userSign) {
  492 + this.userSign = userSign;
  493 + }
  494 +
438 495 public String getSeJue() {
439 496 return seJue;
440 497 }
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java View file @ 402e7cc
... ... @@ -84,7 +84,7 @@
84 84 BabyModelQuery babyQuery = new BabyModelQuery();
85 85 babyQuery.setYn(YnEnums.YES.getId());
86 86 babyQuery.setHospitalId(hospitalId);
87   - //babyQuery.setMphone("15230280694"); // 15027805358 17732261179 15930921847 13851409428 13175251837
  87 + babyQuery.setMphone("15833911677"); // 15027805358 17732261179 15930921847 13851409428 13175251837
88 88  
89 89 List buildType = new ArrayList();
90 90 buildType.add(1);
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ 402e7cc
... ... @@ -504,16 +504,20 @@
504 504 }
505 505  
506 506 } else {
507   - BabyModelQuery babyQuery = getBabyModelQuery(template);
508   - babyQuery.setBirthStart(startDate);
509   - babyQuery.setBirthEnd(endDate);
510   - List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  507 + //BabyModelQuery babyQuery = getBabyModelQuery(template);
  508 + babyModelQuery.setBirthStart(startDate);
  509 + babyModelQuery.setBirthEnd(endDate);
  510 + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
  511 + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString());
511 512 for (BabyModel babyModel : babyModels){
512   - HashMap<String, Object> hashMap = getMapByParam(template, babyModel.getId(), true);
513   - List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
514   - if (CollectionUtils.isNotEmpty(patientServices)){
515   - addBabyRemindMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel);
516   - }
  513 +
  514 + addBabyRemindMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel);
  515 +
  516 +// HashMap<String, Object> hashMap = getMapByParam(template, babyModel.getId(), true);
  517 +// List<Map> patientServices = patientServiceService.getPatientServices(hashMap);
  518 +// if (CollectionUtils.isNotEmpty(patientServices)){
  519 +// addBabyRemindMessages(template, config, service, tempHid, sendTimeType, messages, start, end, babyModel);
  520 +// }
517 521 }
518 522 }
519 523 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java View file @ 402e7cc
... ... @@ -49,6 +49,21 @@
49 49 }
50 50  
51 51  
  52 +
  53 + @RequestMapping(value = "/addPremaritalCheckupSign", method = RequestMethod.POST)
  54 + @ResponseBody
  55 + @TokenRequired
  56 + public BaseResponse addPremaritalCheckupSign(@RequestBody PremaritalCheckupAddRequest addRequest,
  57 + HttpServletRequest request){
  58 +// 获取当前登录用户ID
  59 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  60 +
  61 +
  62 + return premaritalCheckupFacade.addPremaritalCheckupSign(addRequest , loginState.getId());
  63 + }
  64 +
  65 +
  66 +
52 67 /**
53 68 * 查询单个婚前检查
54 69 * @param vcCardNo 就诊卡
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 402e7cc
... ... @@ -4002,5 +4002,21 @@
4002 4002  
4003 4003 @Autowired
4004 4004 private PatientWeightService patientWeightService;
  4005 + @Autowired
  4006 + private PatientSyncMysqlFacade patientSyncMysqlFacade;
  4007 +
  4008 + @ResponseBody
  4009 + @RequestMapping(value = "/syncPatients", method = RequestMethod.GET)
  4010 + public String syncPatients() {
  4011 + patientSyncMysqlFacade.syncPatients();
  4012 + return "success";
  4013 + }
  4014 +
  4015 + @ResponseBody
  4016 + @RequestMapping(value = "/syncAntexc", method = RequestMethod.GET)
  4017 + public String syncAntexc() {
  4018 + patientSyncMysqlFacade.syncAntexc();
  4019 + return "success";
  4020 + }
4005 4021 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 402e7cc
... ... @@ -1249,10 +1249,12 @@
1249 1249 patientServiceService.updatePatientService(service);
1250 1250  
1251 1251 Patients patients = patientsService.findOnePatientById(service.getParentid());
1252   - patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
1253   - patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
1254   - patientsService.updatePatient(patients);
1255   -
  1252 + if (patients != null)
  1253 + {
  1254 + patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
  1255 + patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
  1256 + patientsService.updatePatient(patients);
  1257 + }
1256 1258 }
1257 1259 }
1258 1260  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 402e7cc
... ... @@ -465,6 +465,13 @@
465 465 checkupResult.setYuyan(result.getYuyan());
466 466 checkupResult.setSeJue(result.getSeJue());
467 467  
  468 +
  469 + checkupResult.setBaseSign(result.getBaseSign());
  470 + checkupResult.setPhysiqueSign(result.getPhysiqueSign());
  471 + checkupResult.setRepSign(result.getRepSign());
  472 + checkupResult.setGuidSign(result.getGuidSign());
  473 + checkupResult.setUserSign(result.getUserSign());
  474 +
468 475 return checkupResult;
469 476 }
470 477  
... ... @@ -908,6 +915,13 @@
908 915 checkup.setSeJue(addRequest.getSeJue());
909 916  
910 917  
  918 + checkup.setBaseSign(addRequest.getBaseSign());
  919 + checkup.setPhysiqueSign(addRequest.getPhysiqueSign());
  920 + checkup.setRepSign(addRequest.getRepSign());
  921 + checkup.setGuidSign(addRequest.getGuidSign());
  922 + checkup.setUserSign(addRequest.getUserSign());
  923 +
  924 +
911 925 /* 基础数据 */
912 926 checkup.setYn(YnEnums.YES.getId());
913 927 checkup.setModified(new Date());
... ... @@ -2880,5 +2894,23 @@
2880 2894 return hids;
2881 2895 }
2882 2896  
  2897 + public BaseResponse addPremaritalCheckupSign(PremaritalCheckupAddRequest addRequest, Integer id) {
  2898 +
  2899 + if (StringUtils.isEmpty(addRequest.getId()))
  2900 + {
  2901 + return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
  2902 + }
  2903 + PremaritalCheckupQuery query = new PremaritalCheckupQuery();
  2904 + query.setId(addRequest.getId());
  2905 + List<PremaritalCheckup> dataNan = premaritalCheckupService.queryPremaritalCheckup(query);
  2906 + if (CollectionUtils.isNotEmpty(dataNan))
  2907 + {
  2908 + PremaritalCheckup checkup = dataNan.get(0);
  2909 + checkup.setUserSign(addRequest.getUserSign());
  2910 + premaritalCheckupService.updatePremaritalCheckup(checkup,checkup.getId());
  2911 + }
  2912 +
  2913 + return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
  2914 + }
2883 2915 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 402e7cc
... ... @@ -582,6 +582,7 @@
582 582 map.put("createdTime", DateUtil.getyyyy_MM_dd_hms(data.getCreated()));
583 583 map.put("modifiedTime", DateUtil.getyyyy_MM_dd_hms(data.getCreated()));
584 584 map.put("type", data.getType());
  585 + map.put("dueStatus", data.getDueStatus());
585 586  
586 587 return map;
587 588 }
... ... @@ -2461,6 +2462,16 @@
2461 2462 map.put("checkResult", data.getCheckResult());
2462 2463  
2463 2464 getSelect(data, map);
  2465 +
  2466 +
  2467 + map.put("patientId", data.getParentId()); //
  2468 + map.put("createdTime", DateUtil.getyyyy_MM_dd_hms(data.getCreated()));
  2469 + map.put("modifiedTime", DateUtil.getyyyy_MM_dd_hms(data.getModified()));
  2470 + map.put("pid", data.getPid()); //
  2471 + map.put("ssy", ssy); // 血压
  2472 + map.put("szy", szy); // 血压
  2473 + map.put("yn", data.getYn()); //
  2474 +
2464 2475 br.setErrorcode(ErrorCodeConstants.SUCCESS);
2465 2476 br.setErrormsg("成功");
2466 2477 br.setData(map);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ 402e7cc
... ... @@ -430,6 +430,62 @@
430 430 //色觉
431 431 private String seJue;
432 432  
  433 + //婚检信息签名
  434 + private String baseSign;
  435 +
  436 + //体格检查签名
  437 + private String physiqueSign;
  438 +
  439 + //生殖检查签名
  440 + private String repSign;
  441 +
  442 + //婚前指导签名
  443 + private String guidSign;
  444 +
  445 + //用户签名
  446 + private String userSign;
  447 +
  448 +
  449 + public String getBaseSign() {
  450 + return baseSign;
  451 + }
  452 +
  453 + public void setBaseSign(String baseSign) {
  454 + this.baseSign = baseSign;
  455 + }
  456 +
  457 + public String getPhysiqueSign() {
  458 + return physiqueSign;
  459 + }
  460 +
  461 + public void setPhysiqueSign(String physiqueSign) {
  462 + this.physiqueSign = physiqueSign;
  463 + }
  464 +
  465 + public String getRepSign() {
  466 + return repSign;
  467 + }
  468 +
  469 + public void setRepSign(String repSign) {
  470 + this.repSign = repSign;
  471 + }
  472 +
  473 + public String getGuidSign() {
  474 + return guidSign;
  475 + }
  476 +
  477 + public void setGuidSign(String guidSign) {
  478 + this.guidSign = guidSign;
  479 + }
  480 +
  481 + public String getUserSign() {
  482 + return userSign;
  483 + }
  484 +
  485 + public void setUserSign(String userSign) {
  486 + this.userSign = userSign;
  487 + }
  488 +
433 489 public String getSeJue() {
434 490 return seJue;
435 491 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java View file @ 402e7cc
... ... @@ -405,6 +405,61 @@
405 405  
406 406 //色觉
407 407 private String seJue;
  408 + //婚检信息签名
  409 + private String baseSign;
  410 +
  411 + //体格检查签名
  412 + private String physiqueSign;
  413 +
  414 + //生殖检查签名
  415 + private String repSign;
  416 +
  417 + //婚前指导签名
  418 + private String guidSign;
  419 +
  420 + //用户签名
  421 + private String userSign;
  422 +
  423 +
  424 + public String getBaseSign() {
  425 + return baseSign;
  426 + }
  427 +
  428 + public void setBaseSign(String baseSign) {
  429 + this.baseSign = baseSign;
  430 + }
  431 +
  432 + public String getPhysiqueSign() {
  433 + return physiqueSign;
  434 + }
  435 +
  436 + public void setPhysiqueSign(String physiqueSign) {
  437 + this.physiqueSign = physiqueSign;
  438 + }
  439 +
  440 + public String getRepSign() {
  441 + return repSign;
  442 + }
  443 +
  444 + public void setRepSign(String repSign) {
  445 + this.repSign = repSign;
  446 + }
  447 +
  448 + public String getGuidSign() {
  449 + return guidSign;
  450 + }
  451 +
  452 + public void setGuidSign(String guidSign) {
  453 + this.guidSign = guidSign;
  454 + }
  455 +
  456 + public String getUserSign() {
  457 + return userSign;
  458 + }
  459 +
  460 + public void setUserSign(String userSign) {
  461 + this.userSign = userSign;
  462 + }
408 463  
409 464 public String getSeJue() {
410 465 return seJue;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 402e7cc
... ... @@ -167,8 +167,8 @@
167 167 {
168 168 if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals(
169 169 model.getClassName()) || "26EB0301C4A2410E90985A3E55856E4BD23678A20530C64EC8478C7581BC98073D9BFF0544133E28AB36B23DF4485FB8".equals(model.getClassName())
170   -// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89")
171   -// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB")
  170 + || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89")
  171 + || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB")
172 172 )
173 173 {
174 174 //System.out.println("archiveData="+model.getClassName());
... ... @@ -232,7 +232,7 @@
232 232 public static void main(String[] args)
233 233 {
234 234 try {
235   - String json = "26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89";
  235 + String json = "";
236 236 String data = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016");
237 237 data = LymsEncodeUtil.aesDecrypt(data,"Lymsh@2016");
238 238 data = new String(data.getBytes("utf-8"));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 402e7cc
... ... @@ -997,6 +997,7 @@
997 997 }
998 998 map.put("week", week);
999 999 map.put("bregmatic", StringUtils.isNotEmpty(patientWeight.getBregmatic()) ? patientWeight.getBregmatic() : "1");
  1000 + map.put("bregmaticOther", StringUtils.isNotEmpty(patientWeight.getBregmaticOther()) ? patientWeight.getBregmaticOther() : "");
1000 1001 map.put("height", StringUtils.isEmpty(patientWeight.getBeforeHeight()) ? "" : patientWeight.getBeforeHeight() + " cm");
1001 1002 map.put("beforeWeight", StringUtils.isEmpty(patientWeight.getBeforeWeight()) ? "" : patientWeight.getBeforeWeight() + " 公斤");
1002 1003 map.put("bmi", patientWeight.getBmi());