jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8993f6136b953643061fe6acc273561fde15c251

Authored by yangfei
2 parents 3ac467c649 c1ec70aa63
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 10 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/jgyy/JgyyHisService.java View file @ 8993f61
  1 +package com.lyms.hospitalapi.jgyy;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +
  5 +/**
  6 + * Created by Administrator on 2018/5/8.
  7 + */
  8 +@Service("jgyyHisService")
  9 +public class JgyyHisService {
  10 +
  11 + /**
  12 + * 秦皇岛军工医院
  13 + * 查询病人ID
  14 + * 军工医院查询lis报告先通过就诊卡号查询到病人id
  15 + * 通过病人id到院内系统mysql中查询 vCcardNo字段
  16 + * @param vcCardNo 就诊卡号
  17 + * @return
  18 + */
  19 + public String getIdByVcCardNo(String vcCardNo){
  20 +
  21 + return null;
  22 + }
  23 +
  24 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java View file @ 8993f61
... ... @@ -21,10 +21,10 @@
21 21 * Created by Administrator on 2018/4/20.
22 22 * 通过住院号获取孕妇分娩信息
23 23 */
24   -@Service("LcdcfFmService")
  24 +@Service("lcdcfFmService")
25 25 public class LcdcfFmService {
26 26  
27   - public static MaternalDeliverResult queryFmPatient(String bhnum){
  27 + public MaternalDeliverResult queryFmPatient(String bhnum){
28 28  
29 29 String cloumns = " ID as ID,\n" +
30 30 " BHNUM as BHNUM,\n" +
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java View file @ 8993f61
... ... @@ -106,14 +106,11 @@
106 106 Date start = new Date(end.getTime()-1000*60*60);
107 107 String startStr = fmt.format(start);
108 108 String endStr = fmt.format(end);
109   - System.out.println("start="+startStr+"end="+endStr);
110   - ExceptionUtils.catchException("start="+startStr+"end="+endStr);
  109 + System.out.println("start=" + startStr + "end=" + endStr);
111 110 queryFmPatient(startStr, endStr,null);
112 111 }
113 112  
114 113 public void syncWorker(String startStr,String endStr) {
115   - System.out.println("sync start="+startStr+"end="+endStr);
116   - ExceptionUtils.catchException("start="+startStr+"end="+endStr);
117 114 queryFmPatient(startStr, endStr,null);
118 115 }
119 116  
... ... @@ -173,6 +170,16 @@
173 170 }
174 171  
175 172  
  173 + public void syncByCardNo(String startStr,String endStr,String cardNo) {
  174 + FmPatInfo patInfo = getFmPatInfoByCardNo(cardNo);
  175 + if (patInfo != null && patInfo.getSyxh() != null)
  176 + {
  177 + System.out.println("cardNo=" + cardNo + ";syxh=" + patInfo.getSyxh());
  178 + queryFmPatient(startStr, endStr, patInfo.getSyxh());
  179 + }
  180 + }
  181 +
  182 +
176 183 public void syncByPhone(String startStr,String endStr,String syxh) {
177 184 queryFmPatient(startStr, endStr,syxh);
178 185 }
... ... @@ -266,7 +273,7 @@
266 273  
267 274  
268 275 FmPatInfo patInfo = getFmPatInfoById(item.getSyxh());
269   - if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) {
  276 + if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) || StringUtils.isNotEmpty(patInfo.getCardNo()))) {
270 277 PatientsQuery query = new PatientsQuery();
271 278 query.setYn(YnEnums.YES.getId());
272 279 query.setType(1); //孕妇
273 280  
274 281  
275 282  
... ... @@ -864,12 +871,39 @@
864 871 patInfo = list1.get(0);
865 872 }
866 873 }
867   - DbUtils.closeQuietly(conn);
868 874 return patInfo;
869 875  
  876 + }catch (SQLException e) {
  877 + System.out.println(e.getMessage());
  878 + }
  879 + finally {
  880 + DbUtils.closeQuietly(conn);
  881 + }
  882 + return null;
  883 + }
  884 +
  885 + /**
  886 + * 分娩用户信息，通过身份证号码
  887 + * @param cardNo
  888 + * @return
  889 + */
  890 + public FmPatInfo getFmPatInfoByCardNo(String cardNo)
  891 + {
  892 + Connection conn = ConnTools.makeFmConnection();
  893 + QueryRunner queryRunner = new QueryRunner();
  894 + try {
  895 + FmPatInfo patInfo = null;
  896 +
  897 + List<FmPatInfo> list = queryRunner.query(conn, "SELECT syxh,hzxm as name,sfzh as cardNo,sex as sex,birth,lxrdh as phone, blh FROM THIS4_BASY WHERE hzxm is not null and hzxm <> '' and sfzh = '"+cardNo+"'", new BeanListHandler<FmPatInfo>(FmPatInfo.class));
  898 + if (CollectionUtils.isNotEmpty(list)) {
  899 + patInfo = list.get(0);
  900 + }
  901 + return patInfo;
870 902 } catch (SQLException e) {
  903 + System.out.println(e.getMessage());
  904 + }
  905 + finally {
871 906 DbUtils.closeQuietly(conn);
872   - e.printStackTrace();
873 907 }
874 908 return null;
875 909 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java View file @ 8993f61
... ... @@ -203,6 +203,7 @@
203 203 TempAddRequest addRequest = new TempAddRequest();
204 204 addRequest.setParentId(nutritionInfoRequest.getPatientId());
205 205 addRequest.setPid(nutritionInfoRequest.getPid());
  206 + addRequest.setTemp(nutritionInfoRequest.getTemp());
206 207 return tempFacade.addOrUpdateOneTemp(addRequest, nutritionInfoRequest.getHospitalId(), "");
207 208 }
208 209  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 8993f61
... ... @@ -139,7 +139,7 @@
139 139 private CdfyHisService cdfyHisService;
140 140  
141 141 @Autowired
142   - private com.lyms.hospitalapi.lcdcf.LcdcfFmService LcdcfFmService;
  142 + private com.lyms.hospitalapi.lcdcf.LcdcfFmService lcdcfFmService;
143 143  
144 144  
145 145 static Map<String, String> highRisks = new HashMap<>();
... ... @@ -1696,7 +1696,7 @@
1696 1696 @ResponseBody
1697 1697 public MaternalDeliverResult testLc(String bhnum){
1698 1698  
1699   - return LcdcfFmService.queryFmPatient(bhnum);
  1699 + return lcdcfFmService.queryFmPatient(bhnum);
1700 1700 }
1701 1701  
1702 1702  
... ... @@ -1775,5 +1775,27 @@
1775 1775 }
1776 1776 return "handleSieveTime .....";
1777 1777 }
  1778 +
  1779 + @RequestMapping(value="/his/getLcdcfyByZyhHis")
  1780 + @ResponseBody
  1781 + public Map<String,Object> getLcdcfyByZyhHis(@RequestParam("zyNo")String zyNo){
  1782 + List<Map> list = new ArrayList<>();
  1783 + Map<String,String> data = new HashMap<>();
  1784 + data.put("vcCardNo","4352345");
  1785 + data.put("name","张三");
  1786 + data.put("sex","女");
  1787 + data.put("birthday","2001-01-01");
  1788 + data.put("bhnum","54345");
  1789 + data.put("phone","15622222222");
  1790 + data.put("idCard","510106200101010807");
  1791 + data.put("addr","四川省成都市武侯区");
  1792 + list.add(data);
  1793 + Map<String, Object> map = new HashMap<String, Object>();
  1794 + map.put("hisPatient", list);
  1795 + return map;
  1796 + }
  1797 +
  1798 +
  1799 +
1778 1800 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 8993f61
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.hospitalapi.Cdfy.CdfyHisService;
4 4 import com.lyms.hospitalapi.dzfy.DzfyHisService;
5 5 import com.lyms.hospitalapi.fnfy.FnfyHisService;
  6 +import com.lyms.hospitalapi.qhdfy.QhdfyFmService;
6 7 import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
7 8 import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService;
8 9 import com.lyms.hospitalapi.v2.HisService;
9 10  
... ... @@ -150,10 +151,14 @@
150 151  
151 152 @Autowired
152 153 private ITrackDownService trackDownService;
  154 +
153 155 @Autowired
154 156 private TrackDownRecordService trackDownRecordService;
155 157  
156 158 @Autowired
  159 + private QhdfyFmService qhdfyFmService;
  160 +
  161 + @Autowired
157 162 private CdfyHisService cdfyHisService;
158 163  
159 164  
160 165  
... ... @@ -383,16 +388,24 @@
383 388 }
384 389 }
385 390  
386   - if (type == ServiceObjEnums.YUNOBJ.getId()) {
387   - final Patients tempP = p;
388   - commonThreadPool.execute(new Runnable() {
389   - @Override
390   - public void run() {
  391 +
  392 + final Patients tempP = p;
  393 + commonThreadPool.execute(new Runnable() {
  394 + @Override
  395 + public void run() {
  396 + if (tempP.getType() == ServiceObjEnums.YUNOBJ.getId()) {
391 397 //生成建档短信
392 398 createBuildMsg(tempP);
393 399 }
394   - });
395   - }
  400 + //秦皇岛建档获取分娩信息
  401 + if ("4".equals(HIS_VERSION) && "216".equals(tempP.getHospitalId())) {
  402 + Date startDate = DateUtil.addMonth(new Date(),-3);
  403 + Date endDate = DateUtil.addDay(new Date(), 1);
  404 + qhdfyFmService.syncByCardNo(DateUtil.getyyyy_MM_dd(startDate),DateUtil.getyyyy_MM_dd(endDate),tempP.getCardNo());
  405 + }
  406 + }
  407 + });
  408 +
396 409  
397 410 br.setErrorcode(ErrorCodeConstants.SUCCESS);
398 411 br.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 8993f61
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.hospitalapi.lcdcf.LcdcfFmService;
3 4 import com.lyms.hospitalapi.lcdcf.LcdcfHisModel;
4 5 import com.lyms.hospitalapi.lcdcf.LcdcfHisService;
5 6 import com.lyms.platform.biz.service.*;
... ... @@ -65,6 +66,9 @@
65 66 private LcdcfHisService lcdcfHisService;
66 67  
67 68 @Autowired
  69 + private LcdcfFmService lcdcfFmService;
  70 +
  71 + @Autowired
68 72 private AutoMatchFacade autoMatchFacade;
69 73 @Autowired
70 74 private PersonService personService;
71 75  
72 76  
... ... @@ -862,16 +866,18 @@
862 866  
863 867 String hospital = autoMatchFacade.getHospitalId(userId);
864 868  
  869 + LcdcfHisModel lcdcfHisModel = null;
  870 +
865 871 //聊城东昌府分娩界面通过住院号从his中查询到孕妇的身份号码，然后用身份证号码作为院内系统的查询条件查询孕妇信息
866 872 if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) {
867   - LcdcfHisModel lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo());
  873 + //if ("1000000116".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) {
  874 + lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo());
868 875 if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard())) {
869 876 deliverQueryRequest.setCardNo(lcdcfHisModel.getIdCard());
870 877 } else {
871 878 return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
872 879 }
873 880 }
874   -
875 881 //获取
876 882 /* Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, -1);
877 883 if (null == patients) {
... ... @@ -1020,6 +1026,12 @@
1020 1026 matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk());
1021 1027 matDeliverListResult.setRiskScore(highScoreResult.getScoreStr());
1022 1028 matDeliverListResult.setTireNumber1(tTireNumber);
  1029 +
  1030 + //聊城东昌府医院通过住院号查询分娩信息 然后回填到分娩界面
  1031 + if (lcdcfHisModel != null && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo()))
  1032 + {
  1033 + matDeliverListResult.setDeliverData(lcdcfFmService.queryFmPatient(deliverQueryRequest.getZhuYuanNo()));
  1034 + }
1023 1035  
1024 1036 } catch (Exception e) {
1025 1037 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 8993f61
... ... @@ -4448,10 +4448,20 @@
4448 4448 map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById(
4449 4449 Integer.parseInt(baby.getBabyGender())));
4450 4450  
4451   -
4452   - Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1());
4453   - Integer week = betweenDay / 7;
4454   - Integer day = betweenDay % 7;
  4451 + Integer week = 0;
  4452 + Integer day = 0;
  4453 + Map<String, Object> dueMap = data.getHandDueWeek();
  4454 + if (dueMap != null && dueMap.size() > 0)
  4455 + {
  4456 + week = dueMap.get("week") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week")));
  4457 + day = dueMap.get("day") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day")));
  4458 + }
  4459 + else
  4460 + {
  4461 + Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1());
  4462 + week = betweenDay / 7;
  4463 + day = betweenDay % 7;
  4464 + }
4455 4465  
4456 4466 Date fmDate = DateUtil.parseYMDHM(baby.getDueTime());
4457 4467  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NutritionInfoRequest.java View file @ 8993f61
... ... @@ -24,6 +24,16 @@
24 24 private String ssy;
25 25 private Integer pulse;
26 26  
  27 + private String temp;
  28 +
  29 + public String getTemp() {
  30 + return temp;
  31 + }
  32 +
  33 + public void setTemp(String temp) {
  34 + this.temp = temp;
  35 + }
  36 +
27 37 public String getSzy() {
28 38 return szy;
29 39 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java View file @ 8993f61
... ... @@ -64,6 +64,16 @@
64 64 private String cardNo;
65 65 private String vcCardNo;
66 66  
  67 + private MaternalDeliverResult deliverData;
  68 +
  69 + public MaternalDeliverResult getDeliverData() {
  70 + return deliverData;
  71 + }
  72 +
  73 + public void setDeliverData(MaternalDeliverResult deliverData) {
  74 + this.deliverData = deliverData;
  75 + }
  76 +
67 77 public Integer getDueCount() {
68 78 return dueCount;
69 79 }