Commit 55497860c226cf5ecfe349e2b266c1e9c3a6bdaf
1 parent
7974602632
Exists in
master
and in
6 other branches
聊城分娩接口
Showing 3 changed files with 30 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java
View file @
5549786
... | ... | @@ -17,12 +17,16 @@ |
17 | 17 | |
18 | 18 | public String saveRecord(Patients patient,String hosipitalId){ |
19 | 19 | |
20 | + | |
21 | + | |
20 | 22 | HealthRecord HealthRecord = new HealthRecord(); |
21 | 23 | HealthRecord.setPersonInfoId(""); |
22 | - HealthRecord.setName(""); | |
24 | + HealthRecord.setName(patient.getUsername()); | |
23 | 25 | HealthRecord.setPinYinStr("无"); |
24 | 26 | HealthRecord.setIdNo(patient.getCardNo()); |
25 | 27 | HealthRecord.setTelNo(patient.getPhone()); |
28 | + HealthRecord.setBirthday(patient.getBirth()); | |
29 | + HealthRecord.setAddress(""); | |
26 | 30 | |
27 | 31 | |
28 | 32 | HealthRecord.setIsAppCreate("9"); |
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java
View file @
5549786
... | ... | @@ -32,6 +32,7 @@ |
32 | 32 | " PHONE as PHONE,\n" + |
33 | 33 | " NAME as NAME,\n" + |
34 | 34 | " IDCARD as IDCARD,\n" + |
35 | + " ADDR as addr,\n"+ | |
35 | 36 | " CREATED as CREATED,\t\n" + |
36 | 37 | " to_char(BABY_DELIVERY_TIME,'yyyy-mm-dd hh24:mi:ss') as BABY_DELIVERY_TIME,\n" + |
37 | 38 | " BABY_SEX as BABY_SEX,\n" + |
... | ... | @@ -75,7 +76,7 @@ |
75 | 76 | Map deliveryMode = new HashMap(); //分娩方式 |
76 | 77 | for(Fm fm:list){ |
77 | 78 | maternalDeliverResult.setParentId(fm.getID()); |
78 | - maternalDeliverResult.setDueDate(fm.getBABY_DELIVERY_TIME()); | |
79 | + maternalDeliverResult.setDueDate(fm.getBABY_DELIVERY_TIME().substring(0,10)); | |
79 | 80 | maternalDeliverResult.setDueWeek(fm.getDUE_WEEK()); |
80 | 81 | maternalDeliverResult.setTireNumber(fm.getFETUS_NUM()); |
81 | 82 | maternalDeliverResult.setPlacenta(fm.getPLACENTA_NUM().toString()); |
... | ... | @@ -117,10 +118,14 @@ |
117 | 118 | map.put("three",map3); |
118 | 119 | } |
119 | 120 | |
120 | - int hProcess = Integer.parseInt(fm.getTOTAL_PROCESS())/60;//总产程小时数 | |
121 | - int mProcess = Integer.parseInt(fm.getTOTAL_PROCESS())%60;//总产程分钟数 | |
122 | - totalMap.put("h",String.valueOf(hProcess)); | |
123 | - totalMap.put("m", String.valueOf(mProcess)); | |
121 | + if(fm.getTOTAL_PROCESS()!=null){ | |
122 | + int hProcess = Integer.parseInt(fm.getTOTAL_PROCESS())/60;//总产程小时数 | |
123 | + int mProcess = Integer.parseInt(fm.getTOTAL_PROCESS())%60;//总产程分钟数 | |
124 | + totalMap.put("h",String.valueOf(hProcess)); | |
125 | + totalMap.put("m", String.valueOf(mProcess)); | |
126 | + } | |
127 | + | |
128 | + | |
124 | 129 | |
125 | 130 | maternalDeliverResult.setProdprocess(map); |
126 | 131 | maternalDeliverResult.setTotalprocess(totalMap); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
5549786
... | ... | @@ -3,6 +3,7 @@ |
3 | 3 | import com.alibaba.fastjson.JSON; |
4 | 4 | import com.lyms.hospitalapi.Cdfy.CdfyHisService; |
5 | 5 | import com.lyms.hospitalapi.dzfy.DzfyFmService; |
6 | +import com.lyms.hospitalapi.lcdcf.LcdcfFmService; | |
6 | 7 | import com.lyms.hospitalapi.qhdfy.QhdfyFmService; |
7 | 8 | import com.lyms.hospitalapi.qhdfy.QhdfyHisService; |
8 | 9 | import com.lyms.platform.biz.JdbcUtil; |
... | ... | @@ -20,6 +21,7 @@ |
20 | 21 | import com.lyms.platform.operate.web.facade.*; |
21 | 22 | import com.lyms.platform.operate.web.request.AntExListQueryRequest; |
22 | 23 | import com.lyms.platform.operate.web.result.HighScoreResult; |
24 | +import com.lyms.platform.operate.web.result.MaternalDeliverResult; | |
23 | 25 | import com.lyms.platform.operate.web.service.IBloodPressureService; |
24 | 26 | import com.lyms.platform.operate.web.service.SyncDataTaskService; |
25 | 27 | import com.lyms.platform.operate.web.worker.AntexOtherHighRiskWorker; |
26 | 28 | |
... | ... | @@ -136,7 +138,10 @@ |
136 | 138 | @Autowired |
137 | 139 | private CdfyHisService cdfyHisService; |
138 | 140 | |
141 | + @Autowired | |
142 | + private com.lyms.hospitalapi.lcdcf.LcdcfFmService LcdcfFmService; | |
139 | 143 | |
144 | + | |
140 | 145 | static Map<String, String> highRisks = new HashMap<>(); |
141 | 146 | |
142 | 147 | static { |
... | ... | @@ -1686,6 +1691,16 @@ |
1686 | 1691 | |
1687 | 1692 | return cdfyHisService.getIdByVcCardNo(code); |
1688 | 1693 | } |
1694 | + | |
1695 | + @RequestMapping("/testLc") | |
1696 | + @ResponseBody | |
1697 | + public MaternalDeliverResult testLc(String bhnum){ | |
1698 | + | |
1699 | + return LcdcfFmService.queryFmPatient(bhnum); | |
1700 | + } | |
1701 | + | |
1702 | + | |
1703 | + | |
1689 | 1704 | |
1690 | 1705 | @RequestMapping(value = "/handleSieveTime", method = RequestMethod.GET) |
1691 | 1706 | @ResponseBody |