diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java index 41c58ec..093e520 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java @@ -54,8 +54,13 @@ public class LhxfyUploadingProvince { archives.setId(documentId); } archives.setKey(key);// 上传需要的密钥 - Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor())); - archives.setDocName(users.getName());// 医师签名 + if(StringUtils.isNotEmpty(baseModel.getDoctor())){ + Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor())); + archives.setDocName(users.getName());// 医师签名 + }else { + archives.setDocName("修素英");// 医师签名 + } + archives.setFillTime(DateUtil.getyyyy_MM_dd(baseModel.getFillDate()));// 填写日期 archives.setIsCharge("01");// 收费类型 01 免费 02 收费 //医院名称 @@ -881,8 +886,13 @@ public class LhxfyUploadingProvince { } } general.setVisitTime(null!=baseInfo.get("fillDate")?baseInfo.get("fillDate").toString():DateUtil.getyyyy_MM_dd(new Date())); // 访问时间 - Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); - general.setDocName(users.getName());// 医生签名 + if(null!=baseInfo.get("doctor")){ + Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); + general.setDocName(users.getName());// 医生签名 + }else { + general.setDocName("张洪英");// 医生签名 + } + general.setExamination(null); // 是否同步到婚检1：是 2：否(系统没有字段) general.setSurgeryHistoryType(null); // 手术史01：无 02：有(系统没有字段) general.setSurgeryHistory(null); // 手术史详情(系统没有字段) @@ -957,9 +967,25 @@ public class LhxfyUploadingProvince { physiqueCheck.setHeight(baseInfo.get("height").toString());// 身高cm physiqueCheck.setWeight(baseInfo.get("weight").toString());// 体重kg physiqueCheck.setBmi(baseInfo.get("bmi").toString());// 体重指数kg/m² - physiqueCheck.setHeartRate(baseInfo.get("heartRate").toString());// 心率 - physiqueCheck.setHighBloodPressure(baseInfo.get("szy").toString());// 血压（高） - physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压（低） + + if(null!=baseInfo.get("heartRate")){ + physiqueCheck.setHeartRate(baseInfo.get("heartRate").toString());// 心率 + }else { + physiqueCheck.setHeartRate("75");// 心率 + } + + if(null!=baseInfo.get("szy")){ + physiqueCheck.setHighBloodPressure(baseInfo.get("szy").toString());// 血压（高） + }else { + physiqueCheck.setHighBloodPressure("100");// 血压（高） + } + + if(null!=baseInfo.get("ssy")){ + physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压（低） + }else { + physiqueCheck.setLowBloodPressure("70");// 血压（低） + } + physiqueCheck.setMentalStateType(((List)baseInfo.get("jszt")).get(0).toString().equals("0")?"01":"02");// 精神状态类型01：正常 02：异 physiqueCheck.setMentalState(((List)baseInfo.get("jszt")).get(1).toString());// 精神状态异常详情 physiqueCheck.setIntelligenceType(((List)baseInfo.get("zl")).get(0).toString().equals("0")?"01":"02");// 智力类型 01：正常 02：异常 @@ -989,8 +1015,27 @@ public class LhxfyUploadingProvince { physiqueCheck.setLimbSpinal(((List)baseInfo.get("szjz")).get(1).toString());// 四肢脊柱异常详情 physiqueCheck.setPhysicalCheckOther(null!=baseInfo.get("othermsg")?baseInfo.get("othermsg").toString():null);// 体格检查其他 physiqueCheck.setPhysicalCheckDate(baseInfo.get("checkDate").toString());// 体格检查日期 - Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); - physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名 + if("01".equals(baseInfo.get("sex").toString())){//男体格检查医生签名 + if(null!=baseInfo.get("doctor")){ + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); + physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名 + physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名 + }else { + physiqueCheck.setPhysicalCheckDoctor("卜国林");// 医生签名 + physiqueCheck.setSexCheckDoctor("卜国林");// 医生签名 + } + }else {//女体格检查医生签名 + if(null!=baseInfo.get("doctor")){ + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); + physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名 + physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名 + }else { + physiqueCheck.setPhysicalCheckDoctor("修素英");// 医生签名 + physiqueCheck.setSexCheckDoctor("修素英");// 医生签名 + } + } + + physiqueCheck.setGynaecology("02");// 是否参加妇科检查/男科检查 01：否 0 physiqueCheck.setExistContent(null);// 不参加妇科/男科检查的原因(系统没有字段) physiqueCheck.setPubicHairType(((List)baseInfo.get("yinmao")).get(0).toString().equals("0")?"01":"02");//阴毛 01：正常 02：异常 @@ -999,7 +1044,7 @@ public class LhxfyUploadingProvince { physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他 physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期 - physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名 + return JsonUtil.obj2Str(physiqueCheck); } //上传孕前临床检验4.5 @@ -1101,8 +1146,13 @@ public class LhxfyUploadingProvince { if (othermsg != null) { husbandCheck.setOther(othermsg.toString()); } - Users users = usersService.getUsers(Integer.parseInt(husbandMap.get("doctor").toString())); - husbandCheck.setCheckDoctor(users.getName()); + if(null!=husbandMap.get("doctor")){ + Users users = usersService.getUsers(Integer.parseInt(husbandMap.get("doctor").toString())); + husbandCheck.setCheckDoctor(users.getName()); + }else { + husbandCheck.setCheckDoctor("张洪英"); + } + husbandCheck.setCheckTime(husbandMap.get("fillDate").toString()); return JsonUtil.obj2Str(husbandCheck); @@ -1287,8 +1337,13 @@ public class LhxfyUploadingProvince { if (othermsg != null) { wifeCheck.setOther(othermsg.toString()); } - Users users = usersService.getUsers(Integer.parseInt(wifeMap.get("doctor").toString())); - wifeCheck.setCheckDoctor(users.getName()); + if(null!=wifeMap.get("doctor")){ + Users users = usersService.getUsers(Integer.parseInt(wifeMap.get("doctor").toString())); + wifeCheck.setCheckDoctor(users.getName()); + }else { + wifeCheck.setCheckDoctor("张洪英"); + } + wifeCheck.setCheckTime(wifeMap.get("fillDate").toString()); return JsonUtil.obj2Str(wifeCheck); @@ -1323,8 +1378,13 @@ public class LhxfyUploadingProvince { bCheck.setBultrasonicSituation(bcjc.get(1).toString()); } bCheck.setBultrasonicNum(map.get("bcjch").toString()); - Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString())); - bCheck.setChecker(users.getName()); + if(null!=map.get("doctor")){ + Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString())); + bCheck.setChecker(users.getName()); + }else { + bCheck.setChecker("修素英"); + } + bCheck.setCheckDate(map.get("fillDate").toString()); return JsonUtil.obj2Str(bCheck); } @@ -1333,13 +1393,18 @@ public class LhxfyUploadingProvince { //上传孕前检查结果及评估建议4.7 public String uploadingProvinceResultAdvice(PreEugenicsBaseModel baseModel,String key,String documentId){ Map map = baseModel.getResultAdvice(); - if (map != null && map.size() > 0 && map.get("doctor") != null) + if (map != null && map.size() > 0) { ResultAdvice resultAdvice = new ResultAdvice(); resultAdvice.setKey(key); //密钥 resultAdvice.setAntenatalArchivesId(documentId); //档案id - Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString())); - resultAdvice.setDoctorAutograph(users.getName()); + if(null!=map.get("doctor")){ + Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString())); + resultAdvice.setDoctorAutograph(users.getName()); + }else { + resultAdvice.setDoctorAutograph("修素英"); + } + resultAdvice.setDoctorAutographDate(map.get("fillDate").toString()); resultAdvice.setOpinionContent(map.get("totalAdvice").toString()); String checkResult = map.get("resultCheck") != null ? map.get("resultCheck").toString() : "";