jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3b157619a077edd0aa4832f897930c344a1785bb

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

update

Showing 2 changed files with 16 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java View file @ 3b15761
... ... @@ -159,7 +159,7 @@
159 159  
160 160 Connection conn = com.lyms.hospitalapi.hs.ConnTools.makeFmConnection();
161 161 QueryRunner queryRunner = new QueryRunner();
162   - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  162 + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm");
163 163 try {
164 164  
165 165 String sql ="select "+cloumns+" from v_deliveryinfo where " +
... ... @@ -181,7 +181,7 @@
181 181 String id = fm.getID();//获取所有的孕妇ID，方便孕妇产下双胞胎而用
182 182  
183 183 //用来查询这个孕妇分娩的最近日期的sql
184   - String dateSql = "select max(to_char(CREATED,'yyyy-mm-dd hh24:mi:ss')) as babyDate from zlhis.v_deliveryinfo where " +
  184 + String dateSql = "select max(CREATED) as babyDate from v_deliveryinfo where " +
185 185 " ID='"+id+"'" ;
186 186  
187 187 //获取到这个孕妇的最近的分娩日期
188 188  
189 189  
... ... @@ -190,12 +190,15 @@
190 190 calendar.setTime(fmt.parse(dateList.get(0).getBabyDate()));
191 191 calendar.add(Calendar.DAY_OF_MONTH, -1);
192 192 Date sDate = calendar.getTime();
193   - String startDate = fmt.format(sDate);
  193 +
  194 + SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  195 + String startDate = fmt1.format(sDate);
194 196 String endDate = dateList.get(0).getBabyDate();
195 197  
  198 +
196 199 //查询这个孕妇最近日期所有分娩记录的sql
197   - String allSql = "select "+cloumns+" from zlhis.v_deliveryinfo where " +
198   - " CREATED > to_date('"+startDate+"', 'yyyy-mm-dd hh24:mi:ss') and CREATED <= to_date('"+endDate+"', 'yyyy-mm-dd hh24:mi:ss')" +
  200 + String allSql = "select "+cloumns+" from v_deliveryinfo where " +
  201 + " CREATED > CONVERT(DATETIME,'" + startDate + "', 120) and CREATED <= CONVERT(DATETIME,'" + endDate + "', 120)" +
199 202 " and ID='"+id+"'" ;
200 203  
201 204 //查出这个ID对应孕妇在这个时间段的分娩记录
202 205  
203 206  
204 207  
205 208  
... ... @@ -307,17 +310,17 @@
307 310 if(placenta_Num!=null){
308 311 deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1)
309 312 }
310   - if ("完好".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) {
  313 + if ("完整".equals(allFm.getPERINEAL_CONDITION()) || "".equals(allFm.getPERINEAL_CONDITION())) {
311 314 deliverAddRequest.setPerinealCondition("full");
312   - } else if ("会阴切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) {
  315 + } else if ("切开".equals(allFm.getPERINEAL_CONDITION()) || "侧切".equals(allFm.getPERINEAL_CONDITION())) {
313 316 deliverAddRequest.setPerinealCondition("split");
314 317 }
315 318  
316   - if ("一度裂伤".equals(allFm.getPERINEAL_CONDITION())) {
  319 + if ("1度".equals(allFm.getPERINEAL_CONDITION())) {
317 320 deliverAddRequest.setSiLielevel(1);
318   - } else if ("二度裂伤".equals(allFm.getPERINEAL_CONDITION())) {
  321 + } else if ("2度".equals(allFm.getPERINEAL_CONDITION())) {
319 322 deliverAddRequest.setSiLielevel(2);
320   - } else if ("三度裂伤".equals(allFm.getPERINEAL_CONDITION())) {
  323 + } else if ("3度".equals(allFm.getPERINEAL_CONDITION())) {
321 324 deliverAddRequest.setSiLielevel(3);
322 325 }
323 326  
... ... @@ -400,7 +403,7 @@
400 403 }
401 404 }else{
402 405 a=1;
403   - //德州服务器有分娩记录，但是在这边系统没有对应孕妇 取分娩信息建档儿童数据
  406 + //服务器有分娩记录，但是在这边系统没有对应孕妇 取分娩信息建档儿童数据
404 407 List<String> names = buildBabyName(allList);
405 408  
406 409 Date dateTime = fmt.parse(allFm.getBABY_DELIVERY_TIME());
... ... @@ -457,7 +460,7 @@
457 460  
458 461 if(a==0){
459 462 deliverAddRequest.setBabies(babies);
460   - deliverAddRequest.setFmHospital(HOSPITALID); //设置为德州妇幼
  463 + deliverAddRequest.setFmHospital(HOSPITALID); //
461 464 ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest);
462 465 if(users!=null && users.size()>0){
463 466 matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ 3b15761
... ... @@ -652,7 +652,7 @@
652 652 */
653 653 @RequestMapping(method = RequestMethod.GET, value = "/antexCheckCount")
654 654 @ResponseBody
655   - public BaseResponse antexCheckCount(@PathVariable String checkTime, HttpServletRequest request) {
  655 + public BaseResponse antexCheckCount(@RequestParam String checkTime, HttpServletRequest request) {
656 656 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
657 657 return antenatalExaminationFacade.antexCheckCount(checkTime,loginState.getId());
658 658 }