diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index 9c8c744..dca3e3c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -465,20 +465,20 @@ public class QhdJbgwInterface { Map mapcc = new HashMap<>(); findProcess(data.getProdprocess(),mapcc); if(StringUtils.isNotEmpty(map.get("one"))){ - int oShi = map.get("one").toString().indexOf("时"); + int oShi = mapcc.get("one").toString().indexOf("时"); if(oShi == -1){ - int oFen = map.get("one").toString().indexOf("分"); + int oFen = mapcc.get("one").toString().indexOf("分"); if(-1 != oFen){ - map.put("BIRTHTIME1",map.get("one").toString().substring(0,oFen)); + map.put("BIRTHTIME1",mapcc.get("one").toString().substring(0,oFen)); } }else{ Integer fen = 0; - if(StringUtils.isNotEmpty(map.get("one").toString().substring(0,oShi))){ - fen = Integer.parseInt(map.get("one").toString().substring(0,oShi))*60; + if(StringUtils.isNotEmpty(mapcc.get("one").toString().substring(0,oShi))){ + fen = Integer.parseInt(mapcc.get("one").toString().substring(0,oShi))*60; } - int oFen = map.get("one").toString().indexOf("分"); + int oFen = mapcc.get("one").toString().indexOf("分"); if(-1 != oFen){ - Integer fen2 = Integer.parseInt(map.get("one").toString().substring(oShi + 1, oFen)); + Integer fen2 = Integer.parseInt(mapcc.get("one").toString().substring(oShi + 1, oFen)); map.put("BIRTHTIME1",String.valueOf(fen+fen2)); }else{ map.put("BIRTHTIME1",String.valueOf(fen)); @@ -488,20 +488,20 @@ public class QhdJbgwInterface { } if(StringUtils.isNotEmpty(map.get("two"))){ - int oShi = map.get("two").toString().indexOf("时"); + int oShi = mapcc.get("two").toString().indexOf("时"); if(oShi == -1){ - int oFen = map.get("two").toString().indexOf("分"); + int oFen = mapcc.get("two").toString().indexOf("分"); if(-1 != oFen){ - map.put("BIRTHTIME2",map.get("two").toString().substring(0,oFen)); + map.put("BIRTHTIME2",mapcc.get("two").toString().substring(0,oFen)); } }else{ Integer fen = 0; - if(StringUtils.isNotEmpty(map.get("two").toString().substring(0,oShi))){ - fen = Integer.parseInt(map.get("two").toString().substring(0,oShi))*60; + if(StringUtils.isNotEmpty(mapcc.get("two").toString().substring(0,oShi))){ + fen = Integer.parseInt(mapcc.get("two").toString().substring(0,oShi))*60; } - int oFen = map.get("two").toString().indexOf("分"); + int oFen = mapcc.get("two").toString().indexOf("分"); if(-1 != oFen){ - Integer fen2 = Integer.parseInt(map.get("two").toString().substring(oShi + 1, oFen)); + Integer fen2 = Integer.parseInt(mapcc.get("two").toString().substring(oShi + 1, oFen)); map.put("BIRTHTIME2",String.valueOf(fen+fen2)); }else{ map.put("BIRTHTIME2",String.valueOf(fen)); @@ -510,21 +510,21 @@ public class QhdJbgwInterface { } if(StringUtils.isNotEmpty(map.get("three"))){ - int oShi = map.get("three").toString().indexOf("时"); + int oShi = mapcc.get("three").toString().indexOf("时"); if(oShi == -1){ - int oFen = map.get("three").toString().indexOf("分"); + int oFen = mapcc.get("three").toString().indexOf("分"); if(-1 != oFen){ - map.put("BIRTHTIME3",map.get("three").toString().substring(0,oFen)); + map.put("BIRTHTIME3",mapcc.get("three").toString().substring(0,oFen)); } }else{ Integer fen = 0; - if(StringUtils.isNotEmpty(map.get("three").toString().substring(0,oShi))){ - fen = Integer.parseInt(map.get("three").toString().substring(0,oShi))*60; + if(StringUtils.isNotEmpty(mapcc.get("three").toString().substring(0,oShi))){ + fen = Integer.parseInt(mapcc.get("three").toString().substring(0,oShi))*60; } - int oFen = map.get("three").toString().indexOf("分"); + int oFen = mapcc.get("three").toString().indexOf("分"); if(-1 != oFen){ - Integer fen2 = Integer.parseInt(map.get("three").toString().substring(oShi + 1, oFen)); + Integer fen2 = Integer.parseInt(mapcc.get("three").toString().substring(oShi + 1, oFen)); map.put("BIRTHTIME3",String.valueOf(fen+fen2)); }else{ map.put("BIRTHTIME3",String.valueOf(fen)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java index 649f1e6..9154627 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java @@ -119,7 +119,17 @@ public class QhdJbgwController { @ResponseBody public List> qhdCZ(String startDate,String endDate){ if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){ - return qhdJbgwInterface.getChuZhen(startDate,endDate); + return qhdJbgwInterface.getChuZhen(startDate, endDate); + } + return null; + } + + + @RequestMapping(value = "/qhd/fenmian") + @ResponseBody + public List> qhdFM(String startDate,String endDate){ + if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){ + return qhdJbgwInterface.getFm(startDate,endDate); } return null; }