jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 41dc141f414d9cb1660f415be106e33ba14d4f74

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

秦皇岛出院日期

Showing 2 changed files with 16 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 41dc141
... ... @@ -1005,6 +1005,13 @@
1005 1005 if(info == null && StringUtils.isEmpty(info.getSyxh())){
1006 1006 continue;
1007 1007 }
  1008 +
  1009 + if (StringUtils.isNotEmpty(info.getRyrq()) && StringUtils.isNotEmpty(info.getCyrq()))
  1010 + {
  1011 + map.put("ryrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm(info.getRyrq())));
  1012 + map.put("cyrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm(info.getCyrq())));
  1013 + }
  1014 +
1008 1015 String sqlstr = "select ZDMC as cyzdmc from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc ";
1009 1016 Connection conn2 = null;
1010 1017 try {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 41dc141
... ... @@ -3950,9 +3950,7 @@
3950 3950 public BaseResponse queryHisBabyDiagnosis(String blNo) {
3951 3951 BaseObjectResponse objectResponse = new BaseObjectResponse();
3952 3952 if ("4".equals(HIS_VERSION)) {
3953   -// Map <String, Object> results = qhdfyHisService.queryHisBabyDiagnosis(blNo);
3954 3953 Map <String, Object> results = qhdfyHisService.queryHisBabyDiagnosis2(blNo);//20210108 新规则
3955   - //results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！");
3956 3954 objectResponse.setData(results);
3957 3955 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
3958 3956 objectResponse.setErrormsg("成功");
... ... @@ -3962,6 +3960,15 @@
3962 3960 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
3963 3961 objectResponse.setErrormsg("成功");
3964 3962 }
  3963 +
  3964 + Map <String, Object> results = new HashMap<>();
  3965 + results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！");
  3966 + results.put("ryrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm("2020061102:36:00")));
  3967 + results.put("cyrq",DateUtil.getyyyy_MM_dd(DateUtil.parseYyyyMMddHHssmm("2020071102:36:00")));
  3968 +
  3969 + objectResponse.setData(results);
  3970 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  3971 + objectResponse.setErrormsg("成功");
3965 3972  
3966 3973 return objectResponse;
3967 3974 }