jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fec0c17dbffffaf8b62ef03fd95841cc9579858e

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

自动生成追访信息

Showing 2 changed files with 72 additions and 95 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ fec0c17
... ... @@ -144,35 +144,8 @@
144 144 temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉
145 145 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
146 146  
147   - if (patients.getDueStatus() == 1 || (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩
148   - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
149   - } else if (patients.getType() == 3) { //本院已分娩
150   - if (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1) {
151   - /** 生产方式 */
152   - temp.put("fmType", "自动分娩");
153   - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
154   - } else {
155   - MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
156   - matDeliverQuery.setParentId(patients.getId());
157   - matDeliverQuery.setYn(YnEnums.YES.getId());
158   - matDeliverQuery.setHospitalId(patients.getHospitalId());
159   - //查询分娩记录
160   - List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
161   - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) {
162   - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉
163   - MaternalDeliverModel maternalDeliverModel = list2.get(0);
164   - if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) {
165   - Map<String, String> deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode());
166   - if(deliveryModeMap.containsKey("fmfs")){
167   - /** 生产方式 */
168   - temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs")));
169   - }
170   - }
171   - } else {
172   - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
173   - }
174   - }
175   - }
  147 + //完善分娩方式
  148 + patientFmType(temp,patients);
176 149  
177 150 //孕检次数
178 151 temp.put("yjcount", getChuzhenCount(patients.getId()));
179 152  
... ... @@ -287,38 +260,9 @@
287 260 //建档时间
288 261 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate()));
289 262 temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉
  263 + //完善分娩方式
  264 + patientFmType(temp,patient);
290 265  
291   - //终止妊娠,或自动分娩
292   - if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {
293   - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
294   - } else if (patient.getType() == 3) { //本院已分娩
295   - if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) {
296   - /** 生产方式 */
297   - temp.put("fmType", "自动分娩");
298   - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
299   - } else {
300   - MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
301   - matDeliverQuery.setParentId(patient.getId());
302   - matDeliverQuery.setYn(YnEnums.YES.getId());
303   - matDeliverQuery.setHospitalId(patient.getHospitalId());
304   - //查询分娩记录
305   - List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
306   - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) {
307   - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉
308   - MaternalDeliverModel maternalDeliverModel = list2.get(0);
309   - if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) {
310   - Map<String, String> deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode());
311   - if(deliveryModeMap.containsKey("fmfs")){
312   - /** 生产方式 */
313   - temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs")));
314   - }
315   - }
316   - } else {
317   - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
318   - }
319   - }
320   - }
321   -
322 266 //孕检次数
323 267 temp.put("yjcount", getChuzhenCount(patient.getId()));
324 268  
... ... @@ -372,6 +316,39 @@
372 316 restList.add(temp);
373 317 }
374 318 return restList;
  319 + }
  320 +
  321 + public void patientFmType(Map temp,Patients patient){
  322 + //终止妊娠,或自动分娩
  323 + if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {
  324 + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
  325 + } else if (patient.getType() == 3) { //本院已分娩
  326 + if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) {
  327 + /** 生产方式 */
  328 + temp.put("fmType", "自动分娩");
  329 + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
  330 + } else {
  331 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  332 + matDeliverQuery.setParentId(patient.getId());
  333 + matDeliverQuery.setYn(YnEnums.YES.getId());
  334 + matDeliverQuery.setHospitalId(patient.getHospitalId());
  335 + //查询分娩记录
  336 + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
  337 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) {
  338 + temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉
  339 + MaternalDeliverModel maternalDeliverModel = list2.get(0);
  340 + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) {
  341 + Map<String, String> deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode());
  342 + if(deliveryModeMap.containsKey("fmfs")){
  343 + /** 生产方式 */
  344 + temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs")));
  345 + }
  346 + }
  347 + } else {
  348 + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
  349 + }
  350 + }
  351 + }
375 352 }
376 353  
377 354 /**
platform-operate-api/src/main/webapp/WEB-INF/web.xml View file @ fec0c17
... ... @@ -13,41 +13,41 @@
13 13 version="2.5"
14 14 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
15 15 <!--start跨域开始-->
16   - <!--
17   - <filter>
18   - <filter-name>CorsFilter</filter-name>
19   - <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
20   - <init-param>
21   - <param-name>cors.allowed.origins</param-name>
22   - <param-value>*</param-value>
23   - </init-param>
24   - <init-param>
25   - <param-name>cors.allowed.methods</param-name>
26   - <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
27   - </init-param>
28   - <init-param>
29   - <param-name>cors.allowed.headers</param-name>
30   - <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,authorization</param-value>
31   - </init-param>
32   - <init-param>
33   - <param-name>cors.exposed.headers</param-name>
34   - <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
35   - </init-param>
36   - <init-param>
37   - <param-name>cors.support.credentials</param-name>
38   - <param-value>true</param-value>
39   - </init-param>
40   - <init-param>
41   - <param-name>cors.preflight.maxage</param-name>
42   - <param-value>10</param-value>
43   - </init-param>
44   - </filter>
45   - <filter-mapping>
46   - <filter-name>CorsFilter</filter-name>
47   - <url-pattern>/*</url-pattern>
48   - </filter-mapping>
49   - -->
50   - <!--end跨域结束-->
  16 +
  17 + <filter>
  18 + <filter-name>CorsFilter</filter-name>
  19 + <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
  20 + <init-param>
  21 + <param-name>cors.allowed.origins</param-name>
  22 + <param-value>*</param-value>
  23 + </init-param>
  24 + <init-param>
  25 + <param-name>cors.allowed.methods</param-name>
  26 + <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
  27 + </init-param>
  28 + <init-param>
  29 + <param-name>cors.allowed.headers</param-name>
  30 + <param-value>Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,authorization</param-value>
  31 + </init-param>
  32 + <init-param>
  33 + <param-name>cors.exposed.headers</param-name>
  34 + <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
  35 + </init-param>
  36 + <init-param>
  37 + <param-name>cors.support.credentials</param-name>
  38 + <param-value>true</param-value>
  39 + </init-param>
  40 + <init-param>
  41 + <param-name>cors.preflight.maxage</param-name>
  42 + <param-value>10</param-value>
  43 + </init-param>
  44 + </filter>
  45 + <filter-mapping>
  46 + <filter-name>CorsFilter</filter-name>
  47 + <url-pattern>/*</url-pattern>
  48 + </filter-mapping>
  49 +
  50 +<!--end跨域结束-->
51 51  
52 52 <servlet-mapping>
53 53 <servlet-name>default</servlet-name>