jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 37e554fb116b3f67cea75519aafa42ef416cae3d

Authored by jiangjiazhi
2 parents c4a64e8f3c 2639e721b2
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java View file @ 37e554f
... ... @@ -146,7 +146,7 @@
146 146  
147 147 private void setTempInfo(String id, Map<String, Object> temp, Patients patients, String value, String desc, String ckz, ErrorPatientEnums errorPatientEnums, Date modified) {
148 148 if(patients == null) return;
149   - temp.put("id", id);
  149 + temp.put("id", id + ID_SEPARATOR + DateUtil.getymd());
150 150 temp.put("username", patients.getUsername());
151 151 temp.put("lastMenses", patients.getLastMenses().getTime()/1000);
152 152 temp.put("pid", patients.getPid());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 37e554f
... ... @@ -1978,7 +1978,11 @@
1978 1978 String join = tire.get("join") + "";
1979 1979  
1980 1980 Map<String, Object> tireMap = new HashMap<>();
1981   - tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN));
  1981 + if(StringUtils.isNotEmpty(heartRate)) {
  1982 + tireMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN));
  1983 + } else {
  1984 + tireMap.put("heartRate", "");
  1985 + }
1982 1986 tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition));
1983 1987 tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
1984 1988 tireMap.put("join", JoinEnums.getTitle(join));
... ... @@ -3935,6 +3939,10 @@
3935 3939  
3936 3940 //父亲年龄
3937 3941 map.put("fatherAge",fage);
  3942 +
  3943 +
  3944 + //产妇情况 1良好 其他不选
  3945 + map.put("maternalInfo",data.getMaternalInfo());
3938 3946  
3939 3947 br.setErrorcode(ErrorCodeConstants.SUCCESS);
3940 3948 br.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 37e554f
... ... @@ -542,10 +542,10 @@
542 542 Patients patients = mongoTemplate.findById(parentId, Patients.class);
543 543 if(patients != null && !hospitalId.equals(patients.getHospitalId())) {
544 544 if(!mongoTemplate.exists(Query.query(Criteria.where("source").is(parentId).and("hospitalId").is(hospitalId)), Patients.class)) {
545   - patients.setId(null);
546 545 patients.setHospitalId(hospitalId);
547 546 patients.setEnable("2");
548 547 patients.setSource(patients.getId());
  548 + patients.setId(null);
549 549 patients.setCreated(new Date());
550 550 patientsService.addPatient(patients);
551 551 }