jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ccf604925f014bc5d56ca38a16c0fb9b48bf6a65

Authored by landong2015
2 parents 08641b1662 5bd00c8530
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ ccf6049
... ... @@ -60,6 +60,16 @@
60 60 private String fCh;
61 61 //建档时间
62 62 private String bTime;
  63 + //胎数
  64 + private String tireNumber;
  65 +
  66 + public String getTireNumber() {
  67 + return tireNumber;
  68 + }
  69 +
  70 + public void setTireNumber(String tireNumber) {
  71 + this.tireNumber = tireNumber;
  72 + }
63 73  
64 74 public String getbTime() {
65 75 return bTime;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ ccf6049
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.enums.ServiceStatusEnums;
5 5 import com.lyms.platform.common.enums.ServiceTypeEnums;
  6 +import com.lyms.platform.common.enums.TaiShuEnums;
6 7 import com.lyms.platform.common.enums.YnEnums;
7 8 import com.lyms.platform.common.utils.DateUtil;
8 9 import com.lyms.platform.operate.web.facade.PatientFacade;
... ... @@ -106,7 +107,7 @@
106 107 List<MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery);
107 108 if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
108 109 chanResult.setDueWeek(maternalDeliverModels.get(0).getDueDate());
109   -
  110 + chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + ""));
110 111 try {
111 112 chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName());
112 113 } catch (Exception e) {