Commit 7ceeb63e990b6cfc93aa8e69cc61356a9bac0a63
1 parent
7d408989d1
Exists in
master
and in
6 other branches
Merge branch 'master' of D:\lyms_wrok\regional\regional-platform with conflicts.
Showing 3 changed files with 8 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
View file @
7ceeb63
| 1 | 1 | package com.lyms.platform.operate.web; |
| 2 | 2 | |
| 3 | -import com.lyms.platform.common.utils.DateUtil; | |
| 4 | -import com.lyms.platform.common.utils.ReflectionUtils; | |
| 5 | -import com.lyms.platform.pojo.Patients; | |
| 6 | 3 | import net.sourceforge.pinyin4j.PinyinHelper; |
| 7 | 4 | import org.apache.log4j.Logger; |
| 8 | 5 | |
| ... | ... | @@ -22,7 +19,10 @@ |
| 22 | 19 | map.put("temp", "2"); |
| 23 | 20 | restList.add(map); |
| 24 | 21 | com.lyms.platform.operate.web.utils.CollectionUtils.reverseList(restList); |
| 25 | - System.out.println(restList); | |
| 22 | +System.out.println(restList); | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | 26 | /* PatientsQuery patientsQuery = new PatientsQuery(); |
| 27 | 27 | //排查本院隐藏建档 |
| 28 | 28 | patientsQuery.setExtEnable(false); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyBuildSerToPatientSerWorker.java
View file @
7ceeb63
| ... | ... | @@ -93,14 +93,14 @@ |
| 93 | 93 | //服务类型 |
| 94 | 94 | if (pt.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) {//增值服务 |
| 95 | 95 | //精准指导 |
| 96 | - pser.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); | |
| 96 | + pser.setSerType(PatientSerEnums.SerTypeEnums.babyjzzz.getId()); | |
| 97 | 97 | //增值服务有服务医生 |
| 98 | 98 | pser.setSerDoct(pt.getBuildDoctor()); |
| 99 | 99 | |
| 100 | 100 | //增值服务状态转换为服务状态 |
| 101 | 101 | convertZZFWtoPserStatus(pt, pser); |
| 102 | 102 | }else{//标准服务 |
| 103 | - pser.setSerType(PatientSerEnums.SerTypeEnums.bzfw.getId()); | |
| 103 | + pser.setSerType(PatientSerEnums.SerTypeEnums.babyBzfw.getId()); | |
| 104 | 104 | //标准服务状态转换成服务状态 |
| 105 | 105 | convertBZFWtoPserStatus(pt,pser); |
| 106 | 106 | } |
platform-operate-api/src/main/webapp/WEB-INF/web.xml
View file @
7ceeb63
| ... | ... | @@ -13,7 +13,7 @@ |
| 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 | -<!-- | |
| 16 | + | |
| 17 | 17 | <filter> |
| 18 | 18 | <filter-name>CorsFilter</filter-name> |
| 19 | 19 | <filter-class>org.apache.catalina.filters.CorsFilter</filter-class> |
| ... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 | <filter-name>CorsFilter</filter-name> |
| 47 | 47 | <url-pattern>/*</url-pattern> |
| 48 | 48 | </filter-mapping> |
| 49 | ---> | |
| 49 | + | |
| 50 | 50 | <!--end跨域结束--> |
| 51 | 51 | |
| 52 | 52 | <servlet-mapping> |