jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 87186c8f5509e5c5f0f72782d6cdd06838a8b017

Authored by jiangjiazhi
2 parents f917c3a1dd 2141f61cae
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/DoctorModel.java View file @ 87186c8
  1 +package com.lyms.platform.pojo;
  2 +
  3 +/**
  4 + * Created by Administrator on 2017/1/13 0013.
  5 + */
  6 +public class DoctorModel {
  7 +
  8 + private Integer id;
  9 + private String label;
  10 + private String name;
  11 + private String search;
  12 + private String value;
  13 +
  14 + public Integer getId() {
  15 + return id;
  16 + }
  17 +
  18 + public void setId(Integer id) {
  19 + this.id = id;
  20 + }
  21 +
  22 + public String getLabel() {
  23 + return label;
  24 + }
  25 +
  26 + public void setLabel(String label) {
  27 + this.label = label;
  28 + }
  29 +
  30 + public String getName() {
  31 + return name;
  32 + }
  33 +
  34 + public void setName(String name) {
  35 + this.name = name;
  36 + }
  37 +
  38 + public String getSearch() {
  39 + return search;
  40 + }
  41 +
  42 + public void setSearch(String search) {
  43 + this.search = search;
  44 + }
  45 +
  46 + public String getValue() {
  47 + return value;
  48 + }
  49 +
  50 + public void setValue(String value) {
  51 + this.value = value;
  52 + }
  53 +}
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 87186c8
... ... @@ -341,7 +341,7 @@
341 341 //指导意见
342 342 private String zhiDaoYiJian;
343 343 //婚检医生
344   - private String hunJianDoctor;
  344 + private DoctorModel hunJianDoctor;
345 345  
346 346 public Integer getSexType() {
347 347 return sexType;
348 348  
... ... @@ -1519,11 +1519,11 @@
1519 1519 this.zhiDaoYiJian = zhiDaoYiJian;
1520 1520 }
1521 1521  
1522   - public String getHunJianDoctor() {
  1522 + public DoctorModel getHunJianDoctor() {
1523 1523 return hunJianDoctor;
1524 1524 }
1525 1525  
1526   - public void setHunJianDoctor(String hunJianDoctor) {
  1526 + public void setHunJianDoctor(DoctorModel hunJianDoctor) {
1527 1527 this.hunJianDoctor = hunJianDoctor;
1528 1528 }
1529 1529 }
platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java View file @ 87186c8
... ... @@ -44,8 +44,6 @@
44 44 private String certificateTypeId;
45 45 //就诊卡号
46 46 private String vcCardNo;
47   - //婚检医生
48   - private String hunJianDoctor;
49 47 //医学意见
50 48 private Integer yiXueYiJian;
51 49 //性别类型
... ... @@ -96,9 +94,6 @@
96 94 if (StringUtils.isNotBlank(vcCardNo)) {
97 95 condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
98 96 }
99   - if (StringUtils.isNotBlank(hunJianDoctor)) {
100   - condition = condition.and("hunJianDoctor", hunJianDoctor, MongoOper.IS);
101   - }
102 97 if (yiXueYiJian!=null) {
103 98 condition = condition.and("yiXueYiJian", yiXueYiJian, MongoOper.IS);
104 99 }
... ... @@ -213,14 +208,6 @@
213 208  
214 209 public void setVcCardNo(String vcCardNo) {
215 210 this.vcCardNo = vcCardNo;
216   - }
217   -
218   - public String getHunJianDoctor() {
219   - return hunJianDoctor;
220   - }
221   -
222   - public void setHunJianDoctor(String hunJianDoctor) {
223   - this.hunJianDoctor = hunJianDoctor;
224 211 }
225 212  
226 213 public Integer getYiXueYiJian() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ 87186c8
... ... @@ -417,7 +417,7 @@
417 417 map.put("id",data.getId());
418 418 ResidentsArchiveModel model = residentsArchiveService.getResident(data.getParentId());
419 419 map.put("username",model.getUsername());
420   - map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
  420 + map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
421 421 map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
422 422 map.put("drawTime", DateUtil.getyyyy_MM_dd(data.getDrawTime()));
423 423 map.put("drawCount", data.getDrawCount());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 87186c8
... ... @@ -23,6 +23,7 @@
23 23 import com.lyms.platform.permission.model.Organization;
24 24 import com.lyms.platform.permission.service.OrganizationService;
25 25 import com.lyms.platform.pojo.BasicConfig;
  26 +import com.lyms.platform.pojo.DoctorModel;
26 27 import com.lyms.platform.pojo.PremaritalCheckup;
27 28 import com.lyms.platform.pojo.ResidentsArchiveModel;
28 29 import com.lyms.platform.query.PremaritalCheckupQuery;
... ... @@ -417,7 +418,7 @@
417 418 ResidentsArchiveModel model = residentsArchiveService.getResident(checkup.getParentId());
418 419 map.put("premaritalUpTime", DateUtil.getyyyy_MM_dd(checkup.getPremaritalUpTime()));
419 420 map.put("username", model.getUsername());
420   - map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
  421 + map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
421 422 map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
422 423 if (checkup.getJianChaJieGuo() != null && checkup.getJianChaJieGuo() == PhysiologyStatusEnum.NORMAL.getId()) {
423 424 map.put("jianChaJieGuo", PhysiologyStatusEnum.NORMAL.getTitle());
... ... @@ -427,7 +428,13 @@
427 428 map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle());
428 429 map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(),
429 430 model.getAddress(), basicConfigService));
430   - map.put("hunJianDoctor", checkup.getHunJianDoctor());
  431 + String hunJianDoctor = "";
  432 + if (checkup.getHunJianDoctor()!=null){
  433 + DoctorModel doctorModel = checkup.getHunJianDoctor();
  434 + hunJianDoctor = doctorModel.getName();
  435 + }
  436 +
  437 + map.put("hunJianDoctor", hunJianDoctor);
431 438 map.put("id", checkup.getId());
432 439 list.add(map);
433 440 }
434 441  
435 442  
436 443  
... ... @@ -852,19 +859,31 @@
852 859 }
853 860 map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime()));
854 861 map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId));
855   - map.put("certificateNum", DefenceUtils.getId(certificateNum));
  862 + map.put("certificateNum", FunvCommonUtil.getId(certificateNum));
856 863 map.put("vcCardNo", vcCardNo);
857 864 map.put("sexType", "女");
  865 +
  866 + String spouseName = "";
  867 + String spouseCertificateTypeId = "";
  868 + String spouseCertificateNum = "";
  869 + String isBloodshed = "";
  870 + String bloodshed = "";
858 871 if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) {
859 872 map.put("deliverStatus", "提供");
  873 + spouseName = checkup.getSpouseName();
  874 + spouseCertificateTypeId = getBaseicConfigByid(checkup.getSpouseCertificateTypeId());
  875 + spouseCertificateNum = checkup.getSpouseCertificateNum();
  876 + isBloodshed = FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one);
  877 + bloodshed = checkup.getBloodshed();
860 878 } else {
861 879 map.put("deliverStatus", "未提供");
862 880 }
863   - map.put("spouseName", checkup.getSpouseName());
864   - map.put("spouseCertificateTypeId", getBaseicConfigByid(checkup.getSpouseCertificateTypeId()));
865   - map.put("spouseCertificateNum", checkup.getSpouseCertificateNum());
866   - map.put("isBloodshed", FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one));
867   - map.put("bloodshed", checkup.getBloodshed());
  881 + map.put("spouseName", spouseName);
  882 + map.put("spouseCertificateTypeId", spouseCertificateTypeId);
  883 + map.put("spouseCertificateNum",spouseCertificateNum);
  884 + map.put("isBloodshed",isBloodshed );
  885 + map.put("bloodshed", bloodshed);
  886 +
868 887 map.put("menarcheAge", checkup.getMenarcheAge());
869 888 map.put("menstrualCycle", checkup.getMenstrualCycle());
870 889 map.put("menstrualAmount", checkup.getMenstrualAmount());
871 890  
... ... @@ -912,9 +931,13 @@
912 931 map.put("jiZhu", FunvCommonUtil.havaOrNOInteger(checkup.getJiZhu(), two));
913 932 map.put("jiZhuDetails", checkup.getJiZhuDetails());
914 933 map.put("qianBiaoLinBaJie", checkup.getQianBiaoLinBaJie());
915   - map.put("shiLi", checkup.getShiLiZuo() + "/" + checkup.getShiLiYou());
916   - map.put("tingLi", checkup.getTingLiZuo() + "/" + checkup.getTingLiYou());
917 934  
  935 + String shiLi = (checkup.getShiLiZuo() == null? "" : checkup.getShiLiZuo()) + "/" + (checkup.getShiLiYou() == null ? "": checkup.getShiLiYou());
  936 + String tingLi = (checkup.getTingLiZuo() == null? "" : checkup.getTingLiZuo()) + "/" + (checkup.getTingLiYou() == null ? "": checkup.getTingLiYou());
  937 +
  938 + map.put("shiLi", shiLi);
  939 + map.put("tingLi", tingLi);
  940 +
918 941 map.put("bianSe", FunvCommonUtil.havaOrNOInteger(checkup.getBianSe(), two));
919 942 map.put("bianSeDetails", checkup.getBianSeDetails());
920 943  
... ... @@ -979,8 +1002,8 @@
979 1002 map.put("niaoQianXue", checkup.getNiaoQianXue());
980 1003 map.put("niaoChangGuiQiTa", checkup.getNiaoChangGuiQiTa());
981 1004  
982   - map.put("xueXing", checkup.getXueXing());
983   - map.put("rhxueXing", checkup.getRhxueXing());
  1005 + map.put("xueXing", getBaseicConfigByid(checkup.getXueXing()));
  1006 + map.put("rhxueXing", FunvCommonUtil.checkYiGan(checkup.getRhxueXing()));
984 1007 map.put("xueTang", checkup.getXueTang());
985 1008  
986 1009 map.put("xueQingGuBing", checkup.getXueQingGuBing());
987 1010  
988 1011  
... ... @@ -988,18 +1011,18 @@
988 1011 map.put("xueDanBai", checkup.getXueDanBai());
989 1012 map.put("zongDanHongSu", checkup.getZongDanHongSu());
990 1013 map.put("jieHeDanHongSu", checkup.getJieHeDanHongSu());
991   - map.put("bingGan", checkup.getBingGan());
  1014 + map.put("bingGan", FunvCommonUtil.checkYiGan(checkup.getBingGan()));
992 1015  
993   - map.put("yiGanKangYuan", checkup.getYiGanKangYuan());
994   - map.put("yiGanKangTi", checkup.getYiGanKangTi());
995   - map.put("yiGanEKangYuan", checkup.getYiGanEKangYuan());
996   - map.put("yiGanEKangTi", checkup.getYiGanEKangTi());
997   - map.put("yiGanHeXinKangTi", checkup.getYiGanHeXinKangTi());
  1016 + map.put("yiGanKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanKangYuan()));
  1017 + map.put("yiGanKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanKangTi()));
  1018 + map.put("yiGanEKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangYuan()));
  1019 + map.put("yiGanEKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangTi()));
  1020 + map.put("yiGanHeXinKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanHeXinKangTi()));
998 1021  
999 1022 map.put("xueQingJiGan", checkup.getXueQingJiGan());
1000 1023 map.put("xueNiaoSuDan", checkup.getXueNiaoSuDan());
1001   - map.put("shiYanJieGuo", checkup.getShiYanJieGuo());
1002   - map.put("hiv", checkup.getHiv());
  1024 + map.put("shiYanJieGuo", FunvCommonUtil.checkYiGan(checkup.getShiYanJieGuo()));
  1025 + map.put("hiv", FunvCommonUtil.checkYiGan(checkup.getHiv()));
1003 1026 map.put("linBing", checkup.getLinBing());
1004 1027 map.put("xiongTou", checkup.getXiongTou());
1005 1028  
1006 1029  
... ... @@ -1012,14 +1035,20 @@
1012 1035 }
1013 1036 map.put("yiJianQiTaDetails", checkup.getYiJianQiTaDetails());
1014 1037 map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian());
1015   - map.put("hunJianDoctor", checkup.getHunJianDoctor());
  1038 + String hunJianDoctor = "";
  1039 + if (checkup.getHunJianDoctor()!=null){
  1040 + DoctorModel doctorModel = checkup.getHunJianDoctor();
  1041 + hunJianDoctor = doctorModel.getName();
  1042 + }
  1043 +
  1044 + map.put("hunJianDoctor", hunJianDoctor);
1016 1045 list.add(map);
1017 1046 }
1018 1047 }
1019 1048 out = response.getOutputStream();
1020 1049 Map<String, String> cnames = new LinkedHashMap<>();
1021 1050 cnames.put("username", "姓名");
1022   - cnames.put("phone", "类型方式");
  1051 + cnames.put("phone", "联系方式");
1023 1052 cnames.put("age", "年龄");
1024 1053 cnames.put("hospital", "婚检机构");
1025 1054 cnames.put("premaritalUpTime", "婚检时间");
1026 1055  
1027 1056  
1028 1057  
... ... @@ -1221,19 +1250,30 @@
1221 1250 }
1222 1251 map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime()));
1223 1252 map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId));
1224   - map.put("certificateNum", DefenceUtils.getId(certificateNum));
  1253 + map.put("certificateNum", FunvCommonUtil.getId(certificateNum));
1225 1254 map.put("vcCardNo", vcCardNo);
1226 1255 map.put("sexType", "男");
  1256 +
  1257 + String spouseName = "";
  1258 + String spouseCertificateTypeId = "";
  1259 + String spouseCertificateNum = "";
  1260 + String isBloodshed = "";
  1261 + String bloodshed = "";
1227 1262 if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) {
1228 1263 map.put("deliverStatus", "提供");
  1264 + spouseName = checkup.getSpouseName();
  1265 + spouseCertificateTypeId = getBaseicConfigByid(checkup.getSpouseCertificateTypeId());
  1266 + spouseCertificateNum = checkup.getSpouseCertificateNum();
  1267 + isBloodshed = FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one);
  1268 + bloodshed = checkup.getBloodshed();
1229 1269 } else {
1230 1270 map.put("deliverStatus", "未提供");
1231 1271 }
1232   - map.put("spouseName", checkup.getSpouseName());
1233   - map.put("spouseCertificateTypeId", getBaseicConfigByid(checkup.getSpouseCertificateTypeId()));
1234   - map.put("spouseCertificateNum", checkup.getSpouseCertificateNum());
1235   - map.put("isBloodshed", FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one));
1236   - map.put("bloodshed", checkup.getBloodshed());
  1272 + map.put("spouseName", spouseName);
  1273 + map.put("spouseCertificateTypeId", spouseCertificateTypeId);
  1274 + map.put("spouseCertificateNum",spouseCertificateNum);
  1275 + map.put("isBloodshed",isBloodshed );
  1276 + map.put("bloodshed", bloodshed);
1237 1277  
1238 1278 map.put("maritalHistory", FunvCommonUtil.havaOrNOInteger(checkup.getMaritalHistory(), one));
1239 1279 map.put("sangOu", FunvCommonUtil.havaOrNOInteger(checkup.getSangOu(), three));
1240 1280  
... ... @@ -1277,9 +1317,12 @@
1277 1317 map.put("jiZhu", FunvCommonUtil.havaOrNOInteger(checkup.getJiZhu(), two));
1278 1318 map.put("jiZhuDetails", checkup.getJiZhuDetails());
1279 1319 map.put("qianBiaoLinBaJie", checkup.getQianBiaoLinBaJie());
1280   - map.put("shiLi", checkup.getShiLiZuo() + "/" + checkup.getShiLiYou());
1281   - map.put("tingLi", checkup.getTingLiZuo() + "/" + checkup.getTingLiYou());
1282 1320  
  1321 + String shiLi = (checkup.getShiLiZuo() == null? "" : checkup.getShiLiZuo()) + "/" + (checkup.getShiLiYou() == null ? "": checkup.getShiLiYou());
  1322 + String tingLi = (checkup.getTingLiZuo() == null? "" : checkup.getTingLiZuo()) + "/" + (checkup.getTingLiYou() == null ? "": checkup.getTingLiYou());
  1323 + map.put("shiLi", shiLi);
  1324 + map.put("tingLi", tingLi);
  1325 +
1283 1326 map.put("bianSe", FunvCommonUtil.havaOrNOInteger(checkup.getBianSe(), two));
1284 1327 map.put("bianSeDetails", checkup.getBianSeDetails());
1285 1328  
... ... @@ -1369,8 +1412,8 @@
1369 1412 map.put("niaoQianXue", checkup.getNiaoQianXue());
1370 1413 map.put("niaoChangGuiQiTa", checkup.getNiaoChangGuiQiTa());
1371 1414  
1372   - map.put("xueXing", checkup.getXueXing());
1373   - map.put("rhxueXing", checkup.getRhxueXing());
  1415 + map.put("xueXing", getBaseicConfigByid(checkup.getXueXing()));
  1416 + map.put("rhxueXing", FunvCommonUtil.checkYiGan(checkup.getRhxueXing()));
1374 1417 map.put("xueTang", checkup.getXueTang());
1375 1418  
1376 1419 map.put("xueQingGuBing", checkup.getXueQingGuBing());
1377 1420  
1378 1421  
... ... @@ -1378,18 +1421,18 @@
1378 1421 map.put("xueDanBai", checkup.getXueDanBai());
1379 1422 map.put("zongDanHongSu", checkup.getZongDanHongSu());
1380 1423 map.put("jieHeDanHongSu", checkup.getJieHeDanHongSu());
1381   - map.put("bingGan", checkup.getBingGan());
  1424 + map.put("bingGan", FunvCommonUtil.checkYiGan(checkup.getBingGan()));
1382 1425  
1383   - map.put("yiGanKangYuan", checkup.getYiGanKangYuan());
1384   - map.put("yiGanKangTi", checkup.getYiGanKangTi());
1385   - map.put("yiGanEKangYuan", checkup.getYiGanEKangYuan());
1386   - map.put("yiGanEKangTi", checkup.getYiGanEKangTi());
1387   - map.put("yiGanHeXinKangTi", checkup.getYiGanHeXinKangTi());
  1426 + map.put("yiGanKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanKangYuan()));
  1427 + map.put("yiGanKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanKangTi()));
  1428 + map.put("yiGanEKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangYuan()));
  1429 + map.put("yiGanEKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangTi()));
  1430 + map.put("yiGanHeXinKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanHeXinKangTi()));
1388 1431  
1389 1432 map.put("xueQingJiGan", checkup.getXueQingJiGan());
1390 1433 map.put("xueNiaoSuDan", checkup.getXueNiaoSuDan());
1391   - map.put("shiYanJieGuo", checkup.getShiYanJieGuo());
1392   - map.put("hiv", checkup.getHiv());
  1434 + map.put("shiYanJieGuo", FunvCommonUtil.checkYiGan(checkup.getShiYanJieGuo()));
  1435 + map.put("hiv", FunvCommonUtil.checkYiGan(checkup.getHiv()));
1393 1436 map.put("linBing", checkup.getLinBing());
1394 1437 map.put("xiongTou", checkup.getXiongTou());
1395 1438  
1396 1439  
... ... @@ -1403,14 +1446,20 @@
1403 1446  
1404 1447 map.put("yiJianQiTaDetails", checkup.getYiJianQiTaDetails());
1405 1448 map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian());
1406   - map.put("hunJianDoctor", checkup.getHunJianDoctor());
  1449 + String hunJianDoctor = "";
  1450 + if (checkup.getHunJianDoctor()!=null){
  1451 + DoctorModel doctorModel = checkup.getHunJianDoctor();
  1452 + hunJianDoctor = doctorModel.getName();
  1453 + }
  1454 +
  1455 + map.put("hunJianDoctor", hunJianDoctor);
1407 1456 list.add(map);
1408 1457 }
1409 1458 }
1410 1459 out = response.getOutputStream();
1411 1460 Map<String, String> cnames = new LinkedHashMap<>();
1412 1461 cnames.put("username", "姓名");
1413   - cnames.put("phone", "类型方式");
  1462 + cnames.put("phone", "联系方式");
1414 1463 cnames.put("age", "年龄");
1415 1464 cnames.put("hospital", "婚检机构");
1416 1465 cnames.put("premaritalUpTime", "婚检时间");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ 87186c8
1 1 package com.lyms.platform.operate.web.request;
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
  4 +import com.lyms.platform.pojo.DoctorModel;
4 5  
5 6 /**
6 7 * 婚前检查请求数据
... ... @@ -324,7 +325,7 @@
324 325 //指导意见
325 326 private String zhiDaoYiJian;
326 327 //婚检医生
327   - private String hunJianDoctor;
  328 + private DoctorModel hunJianDoctor;
328 329  
329 330 private Integer sexType;
330 331  
331 332  
... ... @@ -1473,11 +1474,11 @@
1473 1474 this.zhiDaoYiJian = zhiDaoYiJian;
1474 1475 }
1475 1476  
1476   - public String getHunJianDoctor() {
  1477 + public DoctorModel getHunJianDoctor() {
1477 1478 return hunJianDoctor;
1478 1479 }
1479 1480  
1480   - public void setHunJianDoctor(String hunJianDoctor) {
  1481 + public void setHunJianDoctor(DoctorModel hunJianDoctor) {
1481 1482 this.hunJianDoctor = hunJianDoctor;
1482 1483 }
1483 1484 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java View file @ 87186c8
1 1 package com.lyms.platform.operate.web.result;
2 2  
  3 +import com.lyms.platform.pojo.DoctorModel;
  4 +
3 5 import java.util.Date;
4 6  
5 7 /**
... ... @@ -326,7 +328,7 @@
326 328 //指导意见
327 329 private String zhiDaoYiJian;
328 330 //婚检医生
329   - private String hunJianDoctor;
  331 + private DoctorModel hunJianDoctor;
330 332  
331 333 public String getId() {
332 334 return id;
333 335  
... ... @@ -1480,11 +1482,11 @@
1480 1482 this.zhiDaoYiJian = zhiDaoYiJian;
1481 1483 }
1482 1484  
1483   - public String getHunJianDoctor() {
  1485 + public DoctorModel getHunJianDoctor() {
1484 1486 return hunJianDoctor;
1485 1487 }
1486 1488  
1487   - public void setHunJianDoctor(String hunJianDoctor) {
  1489 + public void setHunJianDoctor(DoctorModel hunJianDoctor) {
1488 1490 this.hunJianDoctor = hunJianDoctor;
1489 1491 }
1490 1492 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java View file @ 87186c8
... ... @@ -266,10 +266,54 @@
266 266  
267 267 public static final String YIN = "yin";
268 268 public static final String YANG = "yang";
  269 + public static final String RUOYANG = "ruoyang";
  270 + public static final String SPLIT = "split";
  271 + public static final String FULL = "full";
  272 +
269 273 public static final String JIA = "+";
270 274 public static final String JIAN = "-";
  275 + public static final String JJ = "±";
  276 + public static final String WZ = "完整";
  277 + public static final String QK = "切开";
271 278  
  279 + public static final String ONE = "Ⅰ度";
  280 + public static final String TWO = "Ⅱ度";
  281 + public static final String THREE = "Ⅲ度";
  282 +
  283 + public static String checkSiLieLevel(Integer s) {
  284 + if (s==null){
  285 + return "";
  286 + }
  287 + if (s == 1){
  288 + return ONE;
  289 + }else if (s == 2){
  290 + return TWO;
  291 + }else if (s == 3){
  292 + return THREE;
  293 + }else {
  294 + return "";
  295 + }
  296 + }
  297 +
  298 +
272 299 /**
  300 + * 处理会阴字段
  301 + * @param s
  302 + * @return
  303 + */
  304 + public static String checkHuiYin(String s) {
  305 + if (StringUtils.isEmpty(s)){
  306 + return "";
  307 + }
  308 + if (s.equals(SPLIT)){
  309 + return QK;
  310 + }else {
  311 + return WZ;
  312 + }
  313 + }
  314 +
  315 +
  316 + /**
273 317 *
274 318 * @param s
275 319 * @return
276 320  
... ... @@ -280,9 +324,13 @@
280 324 return JIAN;
281 325 }else if (s.equals(YANG)){
282 326 return JIA;
  327 + }else if (s.equals(RUOYANG)){
  328 + return JJ;
  329 + }else {
  330 + return "";
283 331 }
284 332 }
285   - return null;
  333 + return "";
286 334 }
287 335  
288 336  
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml View file @ 87186c8
... ... @@ -84,7 +84,7 @@
84 84 <!-- 配置一个触发器 -->
85 85 <bean id="qhdFmTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
86 86 <property name="jobDetail" ref="qhdFmTimerWork"></property>
87   - <property name="cronExpression" value="0 0 */1 * * ?"></property>
  87 + <property name="cronExpression" value="0 0/5 * * * ?"></property>
88 88 </bean>
89 89  
90 90