jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 094ca037ca8de1469da427230d694a82148a3fb6

Authored by wtt
1 parent 2b738aef74
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 80 additions and 69 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ 094ca03
... ... @@ -269,7 +269,7 @@
269 269 @TokenRequired
270 270 public BaseResponse regionalCqsievesList(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request) {
271 271 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
272   - return sieveFacade.regionalCqsievesList(cqSieveQueryRequest, loginState.getId(), "true", false);
  272 + return sieveFacade.regionalCqsievesList(cqSieveQueryRequest, loginState.getId(), "true", true);
273 273 }
274 274 /**
275 275 * 区域 产筛申请统计导出
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 094ca03
... ... @@ -3147,7 +3147,7 @@
3147 3147 }
3148 3148 public void exportRegionalCqsievesList(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
3149 3149 try {
3150   - BaseListResponse listResponse = (BaseListResponse) regionalCqsievesList(cqSieveQueryRequest, id, "true", true);
  3150 + BaseListResponse listResponse = (BaseListResponse) regionalCqsievesList(cqSieveQueryRequest, id, null, true);
3151 3151  
3152 3152 List<SieveListResult> list = listResponse.getData();
3153 3153 List<Map<String, Object>> datas = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveRegionalCqsievesWorker.java View file @ 094ca03
... ... @@ -60,80 +60,91 @@
60 60 List<SieveListResult> results = new ArrayList<>();
61 61  
62 62 for (SieveModel sieveModel : list) {
63   - SieveListResult sieveListResult = new SieveListResult();
64   - //申请孕周
65   - AntExQuery antExQuery = new AntExQuery();
66   - antExQuery.setYn(YnEnums.YES.getId());
67   - antExQuery.setHospitalId(sieveModel.getHospitalId());
68   - antExQuery.setParentId(sieveModel.getParentId());
  63 + SieveResultModel resultModel = null;
  64 + try {
  65 + SieveListResult sieveListResult = new SieveListResult();
  66 + //申请孕周
  67 + AntExQuery antExQuery = new AntExQuery();
  68 + antExQuery.setYn(YnEnums.YES.getId());
  69 + antExQuery.setHospitalId(sieveModel.getHospitalId());
  70 + antExQuery.setParentId(sieveModel.getParentId());
69 71  
70   - //获取产筛申请数据
71   - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
72   - sieveApplyOrderQuery.setSort("created descc");
73   - sieveApplyOrderQuery.setParentId(sieveModel.getParentId());
74   - sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId());
75   - sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
76   - sieveApplyOrderQuery.setLymsSieveId(sieveModel.getId());
  72 + //获取产筛申请数据
  73 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  74 + sieveApplyOrderQuery.setSort("created descc");
  75 + sieveApplyOrderQuery.setParentId(sieveModel.getParentId());
  76 + sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId());
  77 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  78 + sieveApplyOrderQuery.setLymsSieveId(sieveModel.getId());
77 79  
78   - //产筛结果
79   - SieveResultQuery sieveResultQuery = new SieveResultQuery();
80   - sieveResultQuery.setSort("created descc");
81   - sieveResultQuery.setParentId(sieveModel.getParentId());
82   - sieveResultQuery.setYn(YnEnums.YES.getId());
83   - List<SieveResultModel> resultModels = sieveService.queryListSieveResult(sieveResultQuery);
84   - if (CollectionUtils.isNotEmpty(resultModels)) {
85   - SieveResultModel resultModel = resultModels.get(0);
86   - if(StringUtils.isNotEmpty(resultModel.getTszhz())){
87   - sieveListResult.setTszhz(SieveEnums.getTitle(Integer.parseInt(resultModel.getTszhz())));//21 -三体
  80 + //产筛结果
  81 + SieveResultQuery sieveResultQuery = new SieveResultQuery();
  82 + sieveResultQuery.setSort("created descc");
  83 + sieveResultQuery.setParentId(sieveModel.getParentId());
  84 + sieveResultQuery.setYn(YnEnums.YES.getId());
  85 + List<SieveResultModel> resultModels = sieveService.queryListSieveResult(sieveResultQuery);
  86 + if (CollectionUtils.isNotEmpty(resultModels)) {
  87 + resultModel = resultModels.get(0);
  88 + if(StringUtils.isNotEmpty(resultModel.getTszhz())){
  89 + sieveListResult.setTszhz(SieveEnums.getTitle(Integer.parseInt(resultModel.getTszhz())));//21 -三体
  90 + }
  91 + if(StringUtils.isNotEmpty(resultModel.getSbst())){
  92 + sieveListResult.setSbst(SieveEnums.getTitle(Integer.parseInt(resultModel.getSbst())));// 18-三体
  93 + }
  94 + if(StringUtils.isNotEmpty(resultModel.getSjgjx())){
  95 + if(resultModel.getSjgjx().contains("/") ){
  96 + String sjgjx = resultModel.getSjgjx();
  97 + sjgjx= sjgjx.substring(0,sjgjx.indexOf("/"));
  98 + sieveListResult.setSjgjx(SieveEnums.getTitle(Integer.parseInt(sjgjx)));// 神经管畸形
  99 + }else {
  100 + sieveListResult.setSjgjx(SieveEnums.getTitle(Integer.parseInt(resultModel.getSjgjx())));// 神经管畸形
  101 + }
  102 + }
88 103 }
89   - if(StringUtils.isNotEmpty(resultModel.getSbst())){
90   - sieveListResult.setSbst(SieveEnums.getTitle(Integer.parseInt(resultModel.getSbst())));// 18-三体
  104 + List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
  105 + if(CollectionUtils.isEmpty(applyOrderModels)){
  106 + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
  107 + sieveApplyOrderQuery1.setSort("created descc");
  108 + sieveApplyOrderQuery1.setParentId(sieveModel.getParentId());
  109 + sieveApplyOrderQuery1.setHospitalId(sieveModel.getHospitalId());
  110 + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
  111 + applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
91 112 }
92   - if(StringUtils.isNotEmpty(resultModel.getSjgjx())){
93   - sieveListResult.setSjgjx(SieveEnums.getTitle(Integer.parseInt(resultModel.getSjgjx())));// 神经管畸形
94   - }
95   - }
96   - List<SieveApplyOrderModel> applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
97   - if(CollectionUtils.isEmpty(applyOrderModels)){
98   - SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
99   - sieveApplyOrderQuery1.setSort("created descc");
100   - sieveApplyOrderQuery1.setParentId(sieveModel.getParentId());
101   - sieveApplyOrderQuery1.setHospitalId(sieveModel.getHospitalId());
102   - sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
103   - applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
104   - }
105   - sieveListResult.setName(sieveModel.getName()); //姓名
106   - //采血日期
107   - if (CollectionUtils.isNotEmpty(applyOrderModels)) {
108   - SieveApplyOrderModel sieveApplyOrderModel = applyOrderModels.get(0);
  113 + sieveListResult.setName(sieveModel.getName()); //姓名
109 114 //采血日期
110   - sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd(sieveApplyOrderModel.getCollectionDate()));
111   - }
112   - Patients patients = patientsService.findOnePatientById(sieveModel.getParentId());
113   - if (null != patients) {
114   - sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1");
115   - if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
116   - sieveListResult.setcDueWeek("终止妊娠");
117   - else if (patients.getType() == 3) {
118   - sieveListResult.setcDueWeek("已分娩");
  115 + if (CollectionUtils.isNotEmpty(applyOrderModels)) {
  116 + SieveApplyOrderModel sieveApplyOrderModel = applyOrderModels.get(0);
  117 + //采血日期
  118 + sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd(sieveApplyOrderModel.getCollectionDate()));
119 119 }
120   - //年龄
121   - sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
122   - //户籍地
123   - sieveListResult.setPlaceDomicile(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
124   - patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
  120 + Patients patients = patientsService.findOnePatientById(sieveModel.getParentId());
  121 + if (null != patients) {
  122 + sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1");
  123 + if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
  124 + sieveListResult.setcDueWeek("终止妊娠");
  125 + else if (patients.getType() == 3) {
  126 + sieveListResult.setcDueWeek("已分娩");
  127 + }
  128 + //年龄
  129 + sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
  130 + //户籍地
  131 + sieveListResult.setPlaceDomicile(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
  132 + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
  133 + }
  134 + sieveListResult.setApplyTime(DateUtil.getyyyy_MM_dd(sieveModel.getApplyDate())); //申请时间
  135 + sieveListResult.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(sieveModel.getDueWeek()));//申请孕周
  136 + if (StringUtils.isNotEmpty(sieveModel.getApplyHospitalId())) {
  137 + Organization organization = organizationService.getOrganization(Integer.parseInt(sieveModel.getApplyHospitalId()));
  138 + sieveListResult.setApplyHospital(organization.getName()); //申请医院
  139 + }
  140 + sieveListResult.setSieveTypeStr(SieveEnums.SieveTypeEnums.getNameById(sieveModel.getSieveType()));//筛查类型 1 血清学筛查 2/无创基因筛查 3/二者都用
  141 + sieveListResult.setStatusText(SieveStatusEnums.getStrById(sieveModel.getStatus()));//产筛状态
  142 + sieveListResult.setCostTypeStr(SieveEnums.CostTypeEnums.getNameById(sieveModel.getCostType())); // 费用类型 1/免费 2/自费
  143 + sieveListResult.setZtfxText(SieveEnums.getTitle(sieveModel.getZtfx()));//整体风险
  144 + results.add(sieveListResult);
  145 + } catch (NumberFormatException e) {
  146 + e.printStackTrace();
125 147 }
126   - sieveListResult.setApplyTime(DateUtil.getyyyy_MM_dd(sieveModel.getApplyDate())); //申请时间
127   - sieveListResult.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(sieveModel.getDueWeek()));//申请孕周
128   - if (StringUtils.isNotEmpty(sieveModel.getApplyHospitalId())) {
129   - Organization organization = organizationService.getOrganization(Integer.parseInt(sieveModel.getApplyHospitalId()));
130   - sieveListResult.setApplyHospital(organization.getName()); //申请医院
131   - }
132   - sieveListResult.setSieveTypeStr(SieveEnums.SieveTypeEnums.getNameById(sieveModel.getSieveType()));//筛查类型 1 血清学筛查 2/无创基因筛查 3/二者都用
133   - sieveListResult.setStatusText(SieveStatusEnums.getStrById(sieveModel.getStatus()));//产筛状态
134   - sieveListResult.setCostTypeStr(SieveEnums.CostTypeEnums.getNameById(sieveModel.getCostType())); // 费用类型 1/免费 2/自费
135   - sieveListResult.setZtfxText(SieveEnums.getTitle(sieveModel.getZtfx()));//整体风险
136   - results.add(sieveListResult);
137 148 }
138 149 return results;
139 150 }