diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java index 085a401..5ef6d46 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java @@ -19,4 +19,6 @@ public interface MasterCheckItemManageMapper { public List queryCheckItemManage(CheckItemManageQuery checkItemManageQuery); + + int queryCheckItemManageCount(CheckItemManageQuery checkItemManageQuery); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java index ba87419..0e69787 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java @@ -57,6 +57,9 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { @Override public List queryCheckItemManage(CheckItemManageQuery checkItemManageQuery) { + if (checkItemManageQuery.getNeed() != null) { + checkItemManageQuery.mysqlBuild(checkItemManageMapper.queryCheckItemManageCount(checkItemManageQuery)); + } return checkItemManageMapper.queryCheckItemManage(checkItemManageQuery); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml index c4cc366..c711d8f 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml @@ -83,5 +83,17 @@ + + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java index fd6d172..6288e21 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -51,7 +51,6 @@ public class CheckItemManageController extends BaseController { checkItemManageQuery.setLimit(limit); checkItemManageQuery.setAffiliateId(affiliateId); List checkItemManagesList = checkItemManageService.queryCheckItemManage(checkItemManageQuery); - checkItemManageQuery.setCount(checkItemManagesList.size()); if (StringUtils.isNotEmpty(affiliateId)) { for (CheckItemManage checkItemManage : checkItemManagesList) { ArrayList lists = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 73392bf..226bed1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1977,8 +1977,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setEyeAdvice(eyeAdvice); model.setEyeAdviceName(eyeAdviceName); model.setEyeGuideSuggestions(checkModel.getEyeGuideSuggestions()); - - + model.setConfigItemId(checkModel.getConfigItemId()); return model; } @@ -3319,7 +3318,7 @@ public class BabyCheckFacade extends BaseServiceImpl { data.put("allCount", String.valueOf(count)); Map param = new HashMap(); - param.put("type",null); + param.put("type",2); param.put("hospitalId",hospitalId); List checkItems = checkItemService.getCheckItemList(param); if (CollectionUtils.isNotEmpty(checkItems)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index af6d8a7..eb07e3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -23,6 +23,8 @@ import com.lyms.platform.common.utils.HttpClientUtil; import com.lyms.platform.operate.web.request.MessagesResult; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.*; +import com.lyms.platform.permission.model.CheckItem; +import com.lyms.platform.permission.service.CheckItemService; import net.sf.json.JSONArray; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; @@ -226,6 +228,8 @@ public class ViewFacade { @Autowired private QhdfyHisService qhdfyHisService; + @Autowired + private CheckItemService checkItemService; /** * 建档查询 @@ -2346,6 +2350,20 @@ public class ViewFacade { } map.put("PregnancyExcpetion", pe.toString()); + + String nextCheckItem = ""; + if (StringUtils.isNotEmpty(data.getConfigItemId())) + { + String[] arrs = data.getConfigItemId().split(","); + for (String checkItemId : arrs) + { + String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId)); + nextCheckItem+=StringUtils.isEmpty(nextCheckItem) ? checkItem : (","+checkItem); + } + } + map.put("nextCheckItem",nextCheckItem); + + getSelect(data, map); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -3153,6 +3171,17 @@ public class ViewFacade { map.put("tpaAb", data.getTpaAb()); map.put("taAb", data.getTgAb()); map.put("atshr", data.getaTSHR()); + String nextCheckItem = ""; + if (StringUtils.isNotEmpty(data.getConfigItemId())) + { + String[] arrs = data.getConfigItemId().split(","); + for (String checkItemId : arrs) + { + String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId)); + nextCheckItem+=StringUtils.isEmpty(nextCheckItem) ? checkItem : (","+checkItem); + } + } + map.put("nextCheckItem",nextCheckItem); getSelect(data, map); @@ -5746,6 +5775,20 @@ public class ViewFacade { model.setMovementDQ(checkModel.getMovementDQ()); model.setSocialContactDQ(checkModel.getSocialContactDQ()); + + String nextCheckItem = ""; + if (StringUtils.isNotEmpty(checkModel.getConfigItemId())) + { + String[] arrs = checkModel.getConfigItemId().split(","); + for (String checkItemId : arrs) + { + String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId)); + nextCheckItem+=StringUtils.isEmpty(nextCheckItem) ? checkItem : (","+checkItem); + } + } + + model.setNextCheckItem(nextCheckItem); + return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 24c9b11..18f7b5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -1263,6 +1263,7 @@ public class AntExAddRequest implements IBasicRequestConvert { antExChuModel.setPregnancyMethod(pregnancyMethod); antExChuModel.setMonthCompliance(monthCompliance); antExChuModel.setPregnancyExcpetion(pregnancyExcpetion); + antExChuModel.setConfigItemId(configItemId); if (StringUtils.isNotEmpty(fuweiSelect)) { antExChuModel.setFuweiSelect(fuweiSelect); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 3697418..4c33c04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -558,6 +558,9 @@ public class AntexChuResult { */ private String ndbSelectOtherVal; + + + public String getFuweiSelect() { return fuweiSelect; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index f863429..8f5a0d7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -668,8 +668,19 @@ public class BabyCheckPageResult { private String socialContactDQ; + private String nextCheckItem; + + private List messages; + public String getNextCheckItem() { + return nextCheckItem; + } + + public void setNextCheckItem(String nextCheckItem) { + this.nextCheckItem = nextCheckItem; + } + public String getExercise() { return exercise; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 09a4d37..e8efdde 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -624,6 +624,16 @@ public class BabyCheckResult { private Integer okSize; private Integer abnormalSize; + private String configItemId; + + public String getConfigItemId() { + return configItemId; + } + + public void setConfigItemId(String configItemId) { + this.configItemId = configItemId; + } + public List> getOtherDiagnose() { return otherDiagnose; }