jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9569194057c1974cb780b079558decde10e96dd7

Authored by jishenfei
2 parents 8f60871a01 a2d1358691
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java View file @ 9569194
... ... @@ -43,7 +43,7 @@
43 43 */
44 44 @RequestMapping(method = RequestMethod.GET, value = "/findNewHighRisk")
45 45 @ResponseBody
46   - public BaseResponse findNewHighRisk(@RequestParam("orgId") String orgId) {
  46 + public BaseResponse findNewHighRisk( String orgId) {
47 47 return basicConfigFacade.findNewHighRisk(orgId);
48 48 }
49 49  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ 9569194
... ... @@ -65,7 +65,10 @@
65 65 /**
66 66 * 大同单独添加高位因素==高血压（需要药物治疗）
67 67 */
68   - if (!orgId.equalsIgnoreCase("2100002419")) {
  68 + if (StringUtils.isEmpty(orgId) || !orgId.equalsIgnoreCase("2100002419")) {
  69 + System.out.println("+++++++++++++++orgId++++++++++++++++++++");
  70 + System.out.println(orgId);
  71 + System.out.println("+++++++++++++++orgId++++++++++++++++++++");
69 72 Iterator<BasicConfig> basicConfigIterator = basicConfigList.iterator();
70 73 while (basicConfigIterator.hasNext()) {
71 74 BasicConfig basicConfig = basicConfigIterator.next();
... ... @@ -74,7 +77,11 @@
74 77 }
75 78 }
76 79 }
77   - if (orgId.equalsIgnoreCase("2100002419")) {
  80 +
  81 + if (StringUtils.isNotEmpty(orgId)&&orgId.equalsIgnoreCase("2100002419")) {
  82 + System.out.println("+++++++++++++++orgId++++++++++++++++++++");
  83 + System.out.println(orgId);
  84 + System.out.println("+++++++++++++++orgId++++++++++++++++++++");
78 85 Iterator<BasicConfig> basicConfigIterator = basicConfigList.iterator();
79 86 while (basicConfigIterator.hasNext()) {
80 87 BasicConfig basicConfig = basicConfigIterator.next();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ 9569194
... ... @@ -121,7 +121,7 @@
121 121 * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏,领劵社区
122 122 */
123 123 //初诊时间
124   - private Date firstCheckTime;
  124 + private String firstCheckTime;
125 125  
126 126 //领劵社区
127 127 private String couponCommunity;
128 128  
... ... @@ -134,11 +134,11 @@
134 134 this.couponCommunity = couponCommunity;
135 135 }
136 136  
137   - public Date getFirstCheckTime() {
  137 + public String getFirstCheckTime() {
138 138 return firstCheckTime;
139 139 }
140 140  
141   - public void setFirstCheckTime(Date firstCheckTime) {
  141 + public void setFirstCheckTime(String firstCheckTime) {
142 142 this.firstCheckTime = firstCheckTime;
143 143 }
144 144  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ 9569194
... ... @@ -93,7 +93,7 @@
93 93 * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏列表
94 94 */
95 95 if (patients.getFirstCheckTime() != null){
96   - chanResult.setFirstCheckTime(patients.getFirstCheckTime());
  96 + chanResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime()));
97 97 }
98 98 /*********************************************************/
99 99 chanResult.setVcCardNo(patients.getVcCardNo());