jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 65c0413de46cc89539808932c437b847c169210d

Authored by jiangjiazhi
2 parents 5c9ca5dd4b 0daa60f8e9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java View file @ 65c0413
... ... @@ -29,8 +29,6 @@
29 29 public class AmsMessageService {
30 30 private static final Logger logger = Logger.getLogger(AmsMessageService.class);
31 31 public static final String AMS_URL= PropertiesUtils.getPropertyValue("ams_sms");
32   - // private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages";
33   - //private static final String AMS_URL = "http://data.api.stage.healthbaby.com.cn/v1/messages";
34 32 private static final String AUTHORIZATION = "healthbaby2015";
35 33  
36 34  
... ... @@ -74,6 +72,7 @@
74 72  
75 73  
76 74 public static Map<String,List<MessageContent>> getMessageTemplateMap(String hospitalId,AmsServiceTypeEnum serviceType) {
  75 + System.out.println("ams > hospitalId="+hospitalId+";serviceType="+serviceType);
77 76 /**
78 77 * 1、根据医院id查询医院短信模板 2、String -> jsonObject 3、判断 返回 结果
79 78 */
... ... @@ -90,7 +89,6 @@
90 89 // String str = HttpClientUtil.doGet(AMS_URL, params, "utf-8", AUTHORIZATION);
91 90  
92 91 System.out.println("amsurl = "+ AMS_URL);
93   - System.out.println("amscontent = "+ str);
94 92 ObjectMapper om = new ObjectMapper();
95 93 MessageResponseEntity mre = null;
96 94 Map<String,List<MessageContent>> map = new HashMap<String, List<MessageContent>>();
97 95  
... ... @@ -191,10 +189,10 @@
191 189  
192 190  
193 191 public static void main(String[] args) {
194   - Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000014",
  192 + Map<String,List<MessageContent>> list = getMessageTemplateMap("202",
195 193 AmsServiceTypeEnum.CHILD_GUIDE);
196 194  
197   - List<MessageContent> msgs = list.get("高血压");
  195 + List<MessageContent> msgs = list.get("年龄≥35岁");
198 196 //
199 197 System.out.println(msgs);
200 198  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java View file @ 65c0413
... ... @@ -54,11 +54,11 @@
54 54 * @return
55 55 */
56 56 @RequestMapping(value = "/downExChuData", method = RequestMethod.GET)
57   - // @TokenRequired
  57 + @TokenRequired
58 58 public void downExChuData(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) {
59 59 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
60 60  
61   - Map<String, Object> map = viewFacade.exChuData(id,loginState.getId());
  61 + Map<String, Object> map = viewFacade.exChuData(id, loginState.getId());
62 62  
63 63 if (map == null) {
64 64 return;
65 65  
66 66  
67 67  
68 68  
69 69  
70 70  
71 71  
72 72  
73 73  
74 74  
75 75  
76 76  
77 77  
78 78  
... ... @@ -116,41 +116,46 @@
116 116 markPubText(builder, "/");
117 117 }
118 118  
119   - if(data.containsKey("heart")){
  119 + if (data.containsKey("heart")) {
120 120 builder.moveToBookmark("heart");
121   - markFrameText(builder, (String)data.get("heart"));
  121 + markFrameText(builder, (String) data.get("heart"));
122 122 data.remove("heart");
123 123 }
124   - if(data.containsKey("lungs")){
  124 + if (data.containsKey("lungs")) {
125 125 builder.moveToBookmark("lungs");
126   - markFrameText(builder, (String)data.get("lungs"));
  126 + markFrameText(builder, (String) data.get("lungs"));
127 127 data.remove("lungs");
128 128 }
129   - if(data.containsKey("vulva")){
  129 + if (data.containsKey("vulva")) {
130 130 builder.moveToBookmark("vulva");
131   - markFrameText(builder, (String)data.get("vulva"));
  131 + markFrameText(builder, (String) data.get("vulva"));
132 132 data.remove("vulva");
133 133 }
134   - if(data.containsKey("vagina")){
  134 + if (data.containsKey("vagina")) {
135 135 builder.moveToBookmark("vagina");
136   - markFrameText(builder, (String)data.get("vagina"));
  136 + markFrameText(builder, (String) data.get("vagina"));
137 137 data.remove("vagina");
138 138 }
139   - if(data.containsKey("cervical")){
  139 + if (data.containsKey("cervical")) {
140 140 builder.moveToBookmark("cervical");
141   - markFrameText(builder, (String)data.get("cervical"));
  141 + markFrameText(builder, (String) data.get("cervical"));
142 142 data.remove("cervical");
143 143 }
144   - if(data.containsKey("uterus")){
  144 + if (data.containsKey("uterus")) {
145 145 builder.moveToBookmark("uterus");
146   - markFrameText(builder, (String)data.get("uterus"));
  146 + markFrameText(builder, (String) data.get("uterus"));
147 147 data.remove("uterus");
148 148 }
149   - if(data.containsKey("fujian")){
  149 + if (data.containsKey("fujian")) {
150 150 builder.moveToBookmark("fujian");
151   - markFrameText(builder, (String)data.get("fujian"));
  151 + markFrameText(builder, (String) data.get("fujian"));
152 152 data.remove("fujian");
153 153 }
  154 + if (data.containsKey("isZhuan")) {
  155 + builder.moveToBookmark("isZhuan");
  156 + markFrameText(builder, (String) data.get("isZhuan"));
  157 + data.remove("isZhuan");
  158 + }
154 159 builder.moveToBookmark("ydfmw");
155 160 List<String> ydfmw = (List<String>) data.get("ydfmw");
156 161 data.remove("ydfmw");
157 162  
158 163  
159 164  
160 165  
161 166  
... ... @@ -158,19 +163,19 @@
158 163 markFrameText(builder, yf);
159 164 markPubText(builder, "/");
160 165 }
161   - if(data.containsKey("ydqjd")){
  166 + if (data.containsKey("ydqjd")) {
162 167 builder.moveToBookmark("ydqjd");
163   - markFrameText(builder, (String)data.get("ydqjd"));
  168 + markFrameText(builder, (String) data.get("ydqjd"));
164 169 data.remove("ydqjd");
165 170 }
166   - if(data.containsKey("syjg")){
  171 + if (data.containsKey("syjg")) {
167 172 builder.moveToBookmark("syjg");
168   - markFrameText(builder, (String)data.get("syjg"));
  173 + markFrameText(builder, (String) data.get("syjg"));
169 174 data.remove("syjg");
170 175 }
171   - if(data.containsKey("hivkt")){
  176 + if (data.containsKey("hivkt")) {
172 177 builder.moveToBookmark("hivkt");
173   - markFrameText(builder, (String)data.get("hivkt"));
  178 + markFrameText(builder, (String) data.get("hivkt"));
174 179 data.remove("hivkt");
175 180 }
176 181 } catch (Exception e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 65c0413
... ... @@ -1695,6 +1695,7 @@
1695 1695  
1696 1696 String hospitalName = "";
1697 1697 BabyModelQuery babyQuery = new BabyModelQuery();
  1698 + babyQuery.setQueryNo(request.getQueryNo());
1698 1699 if(String.valueOf("true").equals(request.getIsArea())){
1699 1700 List list = new ArrayList();
1700 1701 list.add("1");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ 65c0413
... ... @@ -171,9 +171,9 @@
171 171 br.setEnable(data.getEnable());
172 172 br.setName(data.getName());
173 173 br.setParentId(data.getParentId());
  174 + br.setWeight(data.getWeight());
174 175 configResults.add(br);
175 176 }
176   -
177 177 }
178 178 return configResults;
179 179 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 65c0413
... ... @@ -24,6 +24,7 @@
24 24 import org.apache.commons.collections.CollectionUtils;
25 25 import org.apache.commons.collections.MapUtils;
26 26 import org.apache.commons.lang.StringUtils;
  27 +import org.apache.commons.lang.math.NumberUtils;
27 28 import org.springframework.beans.factory.annotation.Autowired;
28 29 import org.springframework.stereotype.Component;
29 30  
... ... @@ -282,19 +283,6 @@
282 283 return null;
283 284 }
284 285  
285   - String hospital = autoMatchFacade.getHospitalId(userId);
286   -
287   - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
288   - referralApplyOrderQuery.setParentId(data.getParentId());
289   - referralApplyOrderQuery.setOutHospitalId(hospital);
290   - List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
291   - if(CollectionUtils.isNotEmpty(orderModels)){
292   - ReferralApplyOrderModel referralApplyOrderModel = orderModels.get(0);
293   - //转院必要性
294   - String tranDise = referralApplyOrderModel.getTransferredDisease();
295   -
296   - }
297   -
298 286 Map<String, Object> map = new HashMap<>();
299 287 /* 基本信息 */
300 288 //孕妇基本信息
... ... @@ -713,6 +701,30 @@
713 701 if(StringUtils.isNotEmpty(data.getbChao())) {
714 702 map.put("bChao", data.getbChao());
715 703 }
  704 +
  705 +
  706 + String hospital = autoMatchFacade.getHospitalId(userId);
  707 + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
  708 + referralApplyOrderQuery.setParentId(data.getParentId());
  709 + referralApplyOrderQuery.setOutHospitalId(hospital);
  710 + List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
  711 + if(CollectionUtils.isNotEmpty(orderModels)){
  712 + //转院必要性
  713 + if (NumberUtils.isNumber(hospital)) {
  714 + try {
  715 + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(hospital));
  716 + if (null != zhuanc1) {
  717 + map.put("zhuancl",zhuanc1.getName());
  718 + map.put("isZhuan","2");
  719 + }
  720 + } catch (Exception e) {
  721 +
  722 + }
  723 + }
  724 + }else{
  725 + map.put("isZhuan","1");
  726 + }
  727 +
716 728  
717 729 if (data.getNextCheckTime() != null) {
718 730 Calendar nextCheck = Calendar.getInstance();