jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3f55fd5b70c164eaaf9f3441c54c876528a3ae14

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

儿童

Showing 11 changed files with 88 additions and 4 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java View file @ 3f55fd5
... ... @@ -19,5 +19,7 @@
19 19  
20 20  
21 21 public List<CheckItemManage> queryCheckItemManage(CheckItemManageQuery checkItemManageQuery);
  22 +
  23 + int queryCheckItemManageCount(CheckItemManageQuery checkItemManageQuery);
22 24 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java View file @ 3f55fd5
... ... @@ -57,6 +57,9 @@
57 57  
58 58 @Override
59 59 public List<CheckItemManage> queryCheckItemManage(CheckItemManageQuery checkItemManageQuery) {
  60 + if (checkItemManageQuery.getNeed() != null) {
  61 + checkItemManageQuery.mysqlBuild(checkItemManageMapper.queryCheckItemManageCount(checkItemManageQuery));
  62 + }
60 63 return checkItemManageMapper.queryCheckItemManage(checkItemManageQuery);
61 64 }
62 65  
platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml View file @ 3f55fd5
... ... @@ -83,6 +83,18 @@
83 83 <include refid="orderAndLimit"/>
84 84 </select>
85 85  
  86 + <select id="queryCheckItemManage" resultType="int"
  87 + parameterType="com.lyms.platform.permission.model.CheckItemManageQuery">
  88 + SELECT count(id)
  89 + <if test="affiliateId!=null and affiliateId!=''">
  90 + where
  91 + affiliate=#{affiliateId,jdbcType=VARCHAR}
  92 + </if>
  93 + <if test="type !=null">
  94 + and type=#{type,jdbcType=INTEGER}
  95 + </if>
  96 + </select>
  97 +
86 98  
87 99 </mapper>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java View file @ 3f55fd5
... ... @@ -51,7 +51,6 @@
51 51 checkItemManageQuery.setLimit(limit);
52 52 checkItemManageQuery.setAffiliateId(affiliateId);
53 53 List<CheckItemManage> checkItemManagesList = checkItemManageService.queryCheckItemManage(checkItemManageQuery);
54   - checkItemManageQuery.setCount(checkItemManagesList.size());
55 54 if (StringUtils.isNotEmpty(affiliateId)) {
56 55 for (CheckItemManage checkItemManage : checkItemManagesList) {
57 56 ArrayList<String> lists = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 3f55fd5
... ... @@ -1977,8 +1977,7 @@
1977 1977 model.setEyeAdvice(eyeAdvice);
1978 1978 model.setEyeAdviceName(eyeAdviceName);
1979 1979 model.setEyeGuideSuggestions(checkModel.getEyeGuideSuggestions());
1980   -
1981   -
  1980 + model.setConfigItemId(checkModel.getConfigItemId());
1982 1981 return model;
1983 1982  
1984 1983 }
... ... @@ -3319,7 +3318,7 @@
3319 3318 data.put("allCount", String.valueOf(count));
3320 3319  
3321 3320 Map param = new HashMap();
3322   - param.put("type",null);
  3321 + param.put("type",2);
3323 3322 param.put("hospitalId",hospitalId);
3324 3323 List<CheckItem> checkItems = checkItemService.getCheckItemList(param);
3325 3324 if (CollectionUtils.isNotEmpty(checkItems)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 3f55fd5
... ... @@ -23,6 +23,8 @@
23 23 import com.lyms.platform.operate.web.request.MessagesResult;
24 24 import com.lyms.platform.operate.web.result.*;
25 25 import com.lyms.platform.operate.web.utils.*;
  26 +import com.lyms.platform.permission.model.CheckItem;
  27 +import com.lyms.platform.permission.service.CheckItemService;
26 28 import net.sf.json.JSONArray;
27 29 import org.apache.commons.collections.CollectionUtils;
28 30 import org.apache.commons.collections.MapUtils;
... ... @@ -226,6 +228,8 @@
226 228 @Autowired
227 229 private QhdfyHisService qhdfyHisService;
228 230  
  231 + @Autowired
  232 + private CheckItemService checkItemService;
229 233  
230 234 /**
231 235 * 建档查询
... ... @@ -2346,6 +2350,20 @@
2346 2350 }
2347 2351 map.put("PregnancyExcpetion", pe.toString());
2348 2352  
  2353 +
  2354 + String nextCheckItem = "";
  2355 + if (StringUtils.isNotEmpty(data.getConfigItemId()))
  2356 + {
  2357 + String[] arrs = data.getConfigItemId().split(",");
  2358 + for (String checkItemId : arrs)
  2359 + {
  2360 + String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId));
  2361 + nextCheckItem+=StringUtils.isEmpty(nextCheckItem) ? checkItem : (","+checkItem);
  2362 + }
  2363 + }
  2364 + map.put("nextCheckItem",nextCheckItem);
  2365 +
  2366 +
2349 2367 getSelect(data, map);
2350 2368 br.setErrorcode(ErrorCodeConstants.SUCCESS);
2351 2369 br.setErrormsg("成功");
... ... @@ -3153,6 +3171,17 @@
3153 3171 map.put("tpaAb", data.getTpaAb());
3154 3172 map.put("taAb", data.getTgAb());
3155 3173 map.put("atshr", data.getaTSHR());
  3174 + String nextCheckItem = "";
  3175 + if (StringUtils.isNotEmpty(data.getConfigItemId()))
  3176 + {
  3177 + String[] arrs = data.getConfigItemId().split(",");
  3178 + for (String checkItemId : arrs)
  3179 + {
  3180 + String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId));
  3181 + nextCheckItem+=StringUtils.isEmpty(nextCheckItem) ? checkItem : (","+checkItem);
  3182 + }
  3183 + }
  3184 + map.put("nextCheckItem",nextCheckItem);
3156 3185  
3157 3186 getSelect(data, map);
3158 3187  
... ... @@ -5745,6 +5774,20 @@
5745 5774 model.setLanguageDQ(checkModel.getLanguageDQ());
5746 5775 model.setMovementDQ(checkModel.getMovementDQ());
5747 5776 model.setSocialContactDQ(checkModel.getSocialContactDQ());
  5777 +
  5778 +
  5779 + String nextCheckItem = "";
  5780 + if (StringUtils.isNotEmpty(checkModel.getConfigItemId()))
  5781 + {
  5782 + String[] arrs = checkModel.getConfigItemId().split(",");
  5783 + for (String checkItemId : arrs)
  5784 + {
  5785 + String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId));
  5786 + nextCheckItem+=StringUtils.isEmpty(nextCheckItem) ? checkItem : (","+checkItem);
  5787 + }
  5788 + }
  5789 +
  5790 + model.setNextCheckItem(nextCheckItem);
5748 5791  
5749 5792 return model;
5750 5793  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 3f55fd5
... ... @@ -1263,6 +1263,7 @@
1263 1263 examinationModel.setTpaAb(tpaAb);
1264 1264 examinationModel.setaTSHR(aTSHR);
1265 1265 examinationModel.setTgAb(tgAb);
  1266 + examinationModel.setConfigItemId(configItemId);
1266 1267  
1267 1268  
1268 1269 if (StringUtils.isNotEmpty(fuweiSelect)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 3f55fd5
... ... @@ -2214,6 +2214,7 @@
2214 2214 antExChuModel.setPregnancyMethod(pregnancyMethod);
2215 2215 antExChuModel.setMonthCompliance(monthCompliance);
2216 2216 antExChuModel.setPregnancyExcpetion(pregnancyExcpetion);
  2217 + antExChuModel.setConfigItemId(configItemId);
2217 2218  
2218 2219 if (StringUtils.isNotEmpty(fuweiSelect)) {
2219 2220 antExChuModel.setFuweiSelect(fuweiSelect);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 3f55fd5
... ... @@ -558,6 +558,9 @@
558 558 */
559 559 private String ndbSelectOtherVal;
560 560  
  561 +
  562 +
  563 +
561 564 public String getFuweiSelect() {
562 565 return fuweiSelect;
563 566 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java View file @ 3f55fd5
... ... @@ -668,7 +668,18 @@
668 668 private String socialContactDQ;
669 669  
670 670  
  671 + private String nextCheckItem;
  672 +
  673 +
671 674 private List<String> messages;
  675 +
  676 + public String getNextCheckItem() {
  677 + return nextCheckItem;
  678 + }
  679 +
  680 + public void setNextCheckItem(String nextCheckItem) {
  681 + this.nextCheckItem = nextCheckItem;
  682 + }
672 683  
673 684 public String getExercise() {
674 685 return exercise;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ 3f55fd5
... ... @@ -624,6 +624,16 @@
624 624 private Integer okSize;
625 625 private Integer abnormalSize;
626 626  
  627 + private String configItemId;
  628 +
  629 + public String getConfigItemId() {
  630 + return configItemId;
  631 + }
  632 +
  633 + public void setConfigItemId(String configItemId) {
  634 + this.configItemId = configItemId;
  635 + }
  636 +
627 637 public List<Map<String, String>> getOtherDiagnose() {
628 638 return otherDiagnose;
629 639 }