From c6702bd2166548c0b09dccc415d090e4268ac52e Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Wed, 20 Mar 2019 21:54:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E5=B0=8F=E7=A8=8B=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/AntExChuModelTemp.java | 78 +++++++++++--------- .../dao/master/MasterCheckItemMapper.java | 2 +- .../lyms/platform/permission/model/CheckItem.java | 9 +++ .../permission/service/CheckItemService.java | 2 + .../service/impl/CheckItemManageServiceImpl.java | 85 +++++++++++++++++++--- .../service/impl/CheckItemServiceImpl.java | 5 ++ .../resources/mainOrm/master/MasterCheckItem.xml | 6 ++ .../mainOrm/master/MasterCheckItemManage.xml | 4 +- .../web/controller/CheckItemManageController.java | 56 ++++++++++---- 9 files changed, 185 insertions(+), 62 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/AntExChuModelTemp.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/AntExChuModelTemp.java index e6026c0..19693ee 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/AntExChuModelTemp.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/AntExChuModelTemp.java @@ -21,19 +21,19 @@ public class AntExChuModelTemp implements Serializable { private String cDueWeek; private String bg; // 既往史 - private String pastHistory ; + private String pastHistory; // 家族史 - private String familyHistory ; + private String familyHistory; //个人史 private String personalHistory; //疫苗接种史 - private String ymjzHistory ; + private String ymjzHistory; //药物过敏史 - private String ywgmHistory ; + private String ywgmHistory; //妇科手术史 - private String fksxHistory ; + private String fksxHistory; // 叶酸服用 - private String ysfyHistory ; + private String ysfyHistory; //孕次 private Integer pregnancyTimes; // 产次 @@ -47,17 +47,17 @@ public class AntExChuModelTemp implements Serializable { //死胎 private Integer stillbirth; //死产 - private Integer stillChan ; + private Integer stillChan; //新生儿死亡 private Integer neoDeath; //出生缺陷 private Integer birthDefect; // 身高 - private String height; + private String height; //体重 - private String weight ; + private String weight; //孕前体重 - private String yqWeight ; + private String yqWeight; //体重指数 private String baricIndex; //本次妊娠情况 @@ -89,6 +89,18 @@ public class AntExChuModelTemp implements Serializable { private String bp; //丈夫健康情况 private String hHealthInfo; + /** + * 产检项 + */ + private String configItemId; + + public String getConfigItemId() { + return configItemId; + } + + public void setConfigItemId(String configItemId) { + this.configItemId = configItemId; + } public String getPid() { return pid; @@ -219,7 +231,7 @@ public class AntExChuModelTemp implements Serializable { // 衔接 private String join;*/ //高危因素 - private String highrisk ; + private String highrisk; //高危评分 private String highriskSocre; // 其他高危 @@ -238,43 +250,43 @@ public class AntExChuModelTemp implements Serializable { private Object nextCheckTime; private Integer yn; //血红蛋白值 - private String xhdb ; + private String xhdb; //白细胞计数值 - private String bxbjs ; + private String bxbjs; //血小板 private String platelet; // 血常规其他 - private String chgOther ; + private String chgOther; // 尿蛋白 private String ndb; //尿糖 private String nt; //尿同体 - private String urineKetone ; + private String urineKetone; // 尿潜血 - private String bld ; + private String bld; //尿常规其他 private String ncgOther; //ABO - private String abo ; + private String abo; // rh - private String rh ; + private String rh; // 血糖 private String bloodSugar; //B超 - private String bChao ; + private String bChao; //胎数 - private String tireNumber ; + private String tireNumber; //血清谷丙转氨酶 - private String xqgbzam ; + private String xqgbzam; //血清谷草转氨酶 - private String xqgczam ; + private String xqgczam; //白蛋白 - private String albumin ; + private String albumin; //总胆红素 - private String totalBilirubin; + private String totalBilirubin; // 结合胆红素 - private String jhBilirubin ; + private String jhBilirubin; public Object getModified() { return modified; @@ -285,7 +297,7 @@ public class AntExChuModelTemp implements Serializable { } //乙肝表面抗原 - private String ygbmky; + private String ygbmky; //乙肝表面抗体 private String ygbmkt; //乙肝e抗原 @@ -293,19 +305,19 @@ public class AntExChuModelTemp implements Serializable { //乙肝e抗体 private String ygekt; // 乙肝核心抗体 - private String yghxkt; + private String yghxkt; // 血清肌 - private String xqjq; + private String xqjq; // 血尿素氮 - private String xnsd; + private String xnsd; // 梅毒血清实验 // private String mdxqsy; // hit抗体检测 - private String hivkt; + private String hivkt; // 阴道分泌物 - private String ydfmw; + private String ydfmw; // 阴道清洁度 - private String ydqjd; + private String ydqjd; private Object modified; //操作人 @@ -328,8 +340,6 @@ public class AntExChuModelTemp implements Serializable { } - - public String getDiagnosis() { return diagnosis; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java index b04d164..00221ff 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java @@ -10,5 +10,5 @@ public interface MasterCheckItemMapper { public String getOne(Integer id); - + public List xcxGetCheckItemList(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java index 7bf76aa..d858e03 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java @@ -4,6 +4,15 @@ public class CheckItem { private Integer id; private String project; private String projectInfo; + private String checkAttention; + + public String getCheckAttention() { + return checkAttention; + } + + public void setCheckAttention(String checkAttention) { + this.checkAttention = checkAttention; + } public Integer getId() { return id; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java index 4c0dce0..2ef8516 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java @@ -11,5 +11,7 @@ public interface CheckItemService { public String getOne(Integer id); + public List xcxGetCheckItemList(Integer id); + } 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 4bb6a32..0fda3e5 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 @@ -1,19 +1,25 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.biz.AntExChuModelTemp; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper; +import com.lyms.platform.permission.dao.master.MasterCheckItemMapper; +import com.lyms.platform.permission.model.CheckItem; import com.lyms.platform.permission.model.CheckItemManage; import com.lyms.platform.permission.model.CheckItemManageQuery; import com.lyms.platform.permission.service.CheckItemManageService; import com.lyms.platform.pojo.AntenatalExaminationModel; +import org.apache.ibatis.reflection.ExceptionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.*; @Service public class CheckItemManageServiceImpl implements CheckItemManageService { @@ -24,6 +30,9 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { @Autowired private MongoTemplate mongoTemplate; + @Autowired + private MasterCheckItemMapper checkItemMapper; + @Override public List getCheckItemManageList() { return checkItemManageMapper.getCheckItemManageList(); @@ -57,22 +66,74 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { @Override public BaseResponse xcxGetCheckItemManage(String parentId) { - //获取初诊 - List antExChuModelTemps = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModelTemp.class); //获取复诊 List antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId)), AntenatalExaminationModel.class); //1.先查询复诊是否为空 + List list2 = new ArrayList(); if (antenatalExaminationModels != null && antenatalExaminationModels.size() > 0) { - for (AntenatalExaminationModel examinationModel : antenatalExaminationModels) { - //通过修改时间获取他的最后一次记录 - System.out.println("==========>" + examinationModel.getModified()); - String string = examinationModel.getConfigItemId(); - System.out.println("===========>" + string); + //排序 + Collections.sort(antenatalExaminationModels, new Comparator() { + @Override + public int compare(AntenatalExaminationModel arg0, AntenatalExaminationModel arg1) { + int mark = 1; + try { + Date date0 = arg0.getModified(); + Date date1 = arg1.getModified(); + if (date0.getTime() > date1.getTime()) { + mark = -1; + } + if (date0.equals(date1)) { + mark = 0; + } + } catch (Exception e) { + e.printStackTrace(); + + } + return mark; + + } + }); + //获取排序后对象中的第一条数据 + AntenatalExaminationModel examinationModels = antenatalExaminationModels.get(0); + if (examinationModels != null && examinationModels.getConfigItemId() != null) { + System.out.println("=======>复诊" + examinationModels.getConfigItemId()); + System.out.println("=====>时间" + DateUtil.getyyyy_MM_dd_hms(examinationModels.getModified())); + String strCept = examinationModels.getConfigItemId(); + String[] string = strCept.split(","); + for (String s1 : string) { + List list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s1).intValue()); + for (CheckItem checkItem : list1) { + Map map = new HashMap(); + map.put("id", checkItem.getId()); + map.put("project", checkItem.getProject()); + map.put("projectInfo", checkItem.getProjectInfo()); + map.put("checkAttention", checkItem.getCheckAttention()); + list2.add(map); + } + } } - + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list2); + + } else { + //获取初诊 + AntExChuModelTemp antExChuModelTemps = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModelTemp.class); + if (antExChuModelTemps != null && antExChuModelTemps.getConfigItemId() != null) { + System.out.println("========初诊:" + antExChuModelTemps.getConfigItemId()); + String[] str = antExChuModelTemps.getConfigItemId().split(","); + for (String s2 : str) { + List list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue()); + for (CheckItem checkItem : list1) { + Map map = new HashMap(); + map.put("id", checkItem.getId()); + map.put("project", checkItem.getProject()); + map.put("projectInfo", checkItem.getProjectInfo()); + map.put("checkAttention", checkItem.getCheckAttention()); + list2.add(map); + } + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list2); } - - - return null; } } + diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java index f51e309..05998c9 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java @@ -25,5 +25,10 @@ public class CheckItemServiceImpl implements CheckItemService { return checkItemMapper.getOne(id); } + @Override + public List xcxGetCheckItemList(Integer id) { + return checkItemMapper.xcxGetCheckItemList(id); + } + } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml index 80acd10..7601115 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml @@ -6,6 +6,7 @@ + SELECT project FROM lyms_week_project WHERE id=#{id,jdbcType=INTEGER} + + + 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 91abe4a..a472a27 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml @@ -17,8 +17,8 @@ SELECT LAST_INSERT_ID() - INSERT INTO lyms_checkitem(startweek,endweek,checkItemInfoId,affiliate) - VALUES(#{startWeek},#{endWeek},#{checkItemInfoId},#{affiliateId}) + INSERT INTO lyms_checkitem(startweek,endweek,checkItemInfoId,affiliate,modified,created) + VALUES(#{startWeek},#{endWeek},#{checkItemInfoId},#{affiliateId},#{modified},#{created}) 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 0dfb000..1c2cbf4 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 @@ -2,11 +2,14 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.FrontEndResult; +import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.permission.model.CheckItemManage; import com.lyms.platform.permission.model.CheckItemManageQuery; import com.lyms.platform.permission.service.CheckItemManageService; @@ -16,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; @@ -100,7 +104,6 @@ public class CheckItemManageController extends BaseController { return result.toString(); } - /** * 添加展示项信息 */ @@ -115,15 +118,42 @@ public class CheckItemManageController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(response, "请填写必须项!"); return; } else { - CheckItemManage checkItemManage = new CheckItemManage(); - checkItemManage.setStartWeek(startweek); - checkItemManage.setEndWeek(endweek); - checkItemManage.setCheckItemInfoId(checkItemInfoId); - checkItemManage.setAffiliateId(affiliateId); - checkItemManage.setCreated(new Date()); - checkItemManage.setModified(new Date()); - checkItemManageService.addCheckItem(checkItemManage); - ResultUtils.buildSuccessResultAndWrite(response); + if (startweek > endweek) { + ResultUtils.buildParameterErrorResultAndWrite(response, "起始周不能大于结束周!"); + return; + } + boolean start = true; + boolean end = true; + CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery(); + checkItemManageQuery.setAffiliateId(affiliateId); + List list = checkItemManageService.getCheckItemManage(affiliateId); + if (CollectionUtils.isNotEmpty(list)) { + for (CheckItemManage checkItemManage : list) { + if (checkItemManage.getStartWeek() <= startweek && checkItemManage.getEndWeek() >= startweek) { + start = false; + break; + } + } + for (CheckItemManage checkItemManage : list) { + if (checkItemManage.getStartWeek() <= endweek && checkItemManage.getEndWeek() >= endweek) { + end = false; + break; + } + } + } + if (end && start) { + CheckItemManage checkItemManage = new CheckItemManage(); + checkItemManage.setStartWeek(startweek); + checkItemManage.setEndWeek(endweek); + checkItemManage.setCheckItemInfoId(checkItemInfoId); + checkItemManage.setAffiliateId(affiliateId); + checkItemManage.setCreated(new Date()); + checkItemManage.setModified(new Date()); + checkItemManageService.addCheckItem(checkItemManage); + ResultUtils.buildSuccessResultAndWrite(response); + } else { + ResultUtils.buildParameterErrorResultAndWrite(response, "此范围以填写!"); + } } } @@ -157,7 +187,6 @@ public class CheckItemManageController extends BaseController { ResultUtils.buildParameterErrorResultAndWrite(response, "修改失败"); return; } - } /** @@ -181,12 +210,13 @@ public class CheckItemManageController extends BaseController { } /** - * x小程序获取医院展示项接口 + * 小程序获取医院展示项接口 */ @RequestMapping(value = "/xcxGetCheckItem/{parentId}", method = RequestMethod.GET) @ResponseBody public BaseResponse getCheckItem(@PathVariable String parentId) { - System.out.println("=======>进来了!!"); return checkItemManageService.xcxGetCheckItemManage(parentId); } + + } -- 1.8.3.1