jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f5ec85662ff763d4e691026a40f6cfac8913cbef

Authored by shiyang
1 parent 9e4fb50ce3
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

省平台上传孕前优生-医生bug、血压、心率bug

Showing 1 changed file with 84 additions and 19 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java View file @ f5ec856
... ... @@ -54,8 +54,13 @@
54 54 archives.setId(documentId);
55 55 }
56 56 archives.setKey(key);// 上传需要的密钥
57   - Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor()));
58   - archives.setDocName(users.getName());// 医师签名
  57 + if(StringUtils.isNotEmpty(baseModel.getDoctor())){
  58 + Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor()));
  59 + archives.setDocName(users.getName());// 医师签名
  60 + }else {
  61 + archives.setDocName("修素英");// 医师签名
  62 + }
  63 +
59 64 archives.setFillTime(DateUtil.getyyyy_MM_dd(baseModel.getFillDate()));// 填写日期
60 65 archives.setIsCharge("01");// 收费类型 01 免费 02 收费
61 66 //医院名称
... ... @@ -881,8 +886,13 @@
881 886 }
882 887 }
883 888 general.setVisitTime(null!=baseInfo.get("fillDate")?baseInfo.get("fillDate").toString():DateUtil.getyyyy_MM_dd(new Date())); // 访问时间
884   - Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));
885   - general.setDocName(users.getName());// 医生签名
  889 + if(null!=baseInfo.get("doctor")){
  890 + Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));
  891 + general.setDocName(users.getName());// 医生签名
  892 + }else {
  893 + general.setDocName("张洪英");// 医生签名
  894 + }
  895 +
886 896 general.setExamination(null); // 是否同步到婚检1：是 2：否(系统没有字段)
887 897 general.setSurgeryHistoryType(null); // 手术史01：无 02：有(系统没有字段)
888 898 general.setSurgeryHistory(null); // 手术史详情(系统没有字段)
... ... @@ -957,9 +967,25 @@
957 967 physiqueCheck.setHeight(baseInfo.get("height").toString());// 身高cm
958 968 physiqueCheck.setWeight(baseInfo.get("weight").toString());// 体重kg
959 969 physiqueCheck.setBmi(baseInfo.get("bmi").toString());// 体重指数kg/m²
960   - physiqueCheck.setHeartRate(baseInfo.get("heartRate").toString());// 心率
961   - physiqueCheck.setHighBloodPressure(baseInfo.get("szy").toString());// 血压（高）
962   - physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压（低）
  970 +
  971 + if(null!=baseInfo.get("heartRate")){
  972 + physiqueCheck.setHeartRate(baseInfo.get("heartRate").toString());// 心率
  973 + }else {
  974 + physiqueCheck.setHeartRate("75");// 心率
  975 + }
  976 +
  977 + if(null!=baseInfo.get("szy")){
  978 + physiqueCheck.setHighBloodPressure(baseInfo.get("szy").toString());// 血压（高）
  979 + }else {
  980 + physiqueCheck.setHighBloodPressure("100");// 血压（高）
  981 + }
  982 +
  983 + if(null!=baseInfo.get("ssy")){
  984 + physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压（低）
  985 + }else {
  986 + physiqueCheck.setLowBloodPressure("70");// 血压（低）
  987 + }
  988 +
963 989 physiqueCheck.setMentalStateType(((List<Object>)baseInfo.get("jszt")).get(0).toString().equals("0")?"01":"02");// 精神状态类型01：正常 02：异
964 990 physiqueCheck.setMentalState(((List<Object>)baseInfo.get("jszt")).get(1).toString());// 精神状态异常详情
965 991 physiqueCheck.setIntelligenceType(((List<Object>)baseInfo.get("zl")).get(0).toString().equals("0")?"01":"02");// 智力类型 01：正常 02：异常
... ... @@ -989,8 +1015,27 @@
989 1015 physiqueCheck.setLimbSpinal(((List<Object>)baseInfo.get("szjz")).get(1).toString());// 四肢脊柱异常详情
990 1016 physiqueCheck.setPhysicalCheckOther(null!=baseInfo.get("othermsg")?baseInfo.get("othermsg").toString():null);// 体格检查其他
991 1017 physiqueCheck.setPhysicalCheckDate(baseInfo.get("checkDate").toString());// 体格检查日期
992   - Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));
993   - physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名
  1018 + if("01".equals(baseInfo.get("sex").toString())){//男体格检查医生签名
  1019 + if(null!=baseInfo.get("doctor")){
  1020 + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));
  1021 + physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名
  1022 + physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名
  1023 + }else {
  1024 + physiqueCheck.setPhysicalCheckDoctor("卜国林");// 医生签名
  1025 + physiqueCheck.setSexCheckDoctor("卜国林");// 医生签名
  1026 + }
  1027 + }else {//女体格检查医生签名
  1028 + if(null!=baseInfo.get("doctor")){
  1029 + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString()));
  1030 + physiqueCheck.setPhysicalCheckDoctor(users1.getName());// 医生签名
  1031 + physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名
  1032 + }else {
  1033 + physiqueCheck.setPhysicalCheckDoctor("修素英");// 医生签名
  1034 + physiqueCheck.setSexCheckDoctor("修素英");// 医生签名
  1035 + }
  1036 + }
  1037 +
  1038 +
994 1039 physiqueCheck.setGynaecology("02");// 是否参加妇科检查/男科检查 01：否 0
995 1040 physiqueCheck.setExistContent(null);// 不参加妇科/男科检查的原因(系统没有字段)
996 1041 physiqueCheck.setPubicHairType(((List<Object>)baseInfo.get("yinmao")).get(0).toString().equals("0")?"01":"02");//阴毛 01：正常 02：异常
... ... @@ -999,7 +1044,7 @@
999 1044 physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他
1000 1045 physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期
1001 1046  
1002   - physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名
  1047 +
1003 1048 return JsonUtil.obj2Str(physiqueCheck);
1004 1049 }
1005 1050 //上传孕前临床检验4.5
... ... @@ -1101,8 +1146,13 @@
1101 1146 if (othermsg != null) {
1102 1147 husbandCheck.setOther(othermsg.toString());
1103 1148 }
1104   - Users users = usersService.getUsers(Integer.parseInt(husbandMap.get("doctor").toString()));
1105   - husbandCheck.setCheckDoctor(users.getName());
  1149 + if(null!=husbandMap.get("doctor")){
  1150 + Users users = usersService.getUsers(Integer.parseInt(husbandMap.get("doctor").toString()));
  1151 + husbandCheck.setCheckDoctor(users.getName());
  1152 + }else {
  1153 + husbandCheck.setCheckDoctor("张洪英");
  1154 + }
  1155 +
1106 1156 husbandCheck.setCheckTime(husbandMap.get("fillDate").toString());
1107 1157  
1108 1158 return JsonUtil.obj2Str(husbandCheck);
... ... @@ -1287,8 +1337,13 @@
1287 1337 if (othermsg != null) {
1288 1338 wifeCheck.setOther(othermsg.toString());
1289 1339 }
1290   - Users users = usersService.getUsers(Integer.parseInt(wifeMap.get("doctor").toString()));
1291   - wifeCheck.setCheckDoctor(users.getName());
  1340 + if(null!=wifeMap.get("doctor")){
  1341 + Users users = usersService.getUsers(Integer.parseInt(wifeMap.get("doctor").toString()));
  1342 + wifeCheck.setCheckDoctor(users.getName());
  1343 + }else {
  1344 + wifeCheck.setCheckDoctor("张洪英");
  1345 + }
  1346 +
1292 1347 wifeCheck.setCheckTime(wifeMap.get("fillDate").toString());
1293 1348  
1294 1349 return JsonUtil.obj2Str(wifeCheck);
... ... @@ -1323,8 +1378,13 @@
1323 1378 bCheck.setBultrasonicSituation(bcjc.get(1).toString());
1324 1379 }
1325 1380 bCheck.setBultrasonicNum(map.get("bcjch").toString());
1326   - Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString()));
1327   - bCheck.setChecker(users.getName());
  1381 + if(null!=map.get("doctor")){
  1382 + Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString()));
  1383 + bCheck.setChecker(users.getName());
  1384 + }else {
  1385 + bCheck.setChecker("修素英");
  1386 + }
  1387 +
1328 1388 bCheck.setCheckDate(map.get("fillDate").toString());
1329 1389 return JsonUtil.obj2Str(bCheck);
1330 1390 }
1331 1391  
... ... @@ -1333,13 +1393,18 @@
1333 1393 //上传孕前检查结果及评估建议4.7
1334 1394 public String uploadingProvinceResultAdvice(PreEugenicsBaseModel baseModel,String key,String documentId){
1335 1395 Map<String, Object> map = baseModel.getResultAdvice();
1336   - if (map != null && map.size() > 0 && map.get("doctor") != null)
  1396 + if (map != null && map.size() > 0)
1337 1397 {
1338 1398 ResultAdvice resultAdvice = new ResultAdvice();
1339 1399 resultAdvice.setKey(key); //密钥
1340 1400 resultAdvice.setAntenatalArchivesId(documentId); //档案id
1341   - Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString()));
1342   - resultAdvice.setDoctorAutograph(users.getName());
  1401 + if(null!=map.get("doctor")){
  1402 + Users users = usersService.getUsers(Integer.parseInt(map.get("doctor").toString()));
  1403 + resultAdvice.setDoctorAutograph(users.getName());
  1404 + }else {
  1405 + resultAdvice.setDoctorAutograph("修素英");
  1406 + }
  1407 +
1343 1408 resultAdvice.setDoctorAutographDate(map.get("fillDate").toString());
1344 1409 resultAdvice.setOpinionContent(map.get("totalAdvice").toString());
1345 1410 String checkResult = map.get("resultCheck") != null ? map.get("resultCheck").toString() : "";