From 0cfc2da86149fd8dee0a7eb236e9c5e211e6a20f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 18 Oct 2019 16:01:50 +0800 Subject: [PATCH] update --- .../platform/common/enums/AmnioResultEnums.java | 65 +++++++++++++++ .../platform/pojo/AmniocentesisResultModel.java | 5 ++ .../web/controller/AmniocentesisController.java | 32 ++++++++ .../operate/web/facade/AmniocentesisFacade.java | 20 +++++ .../platform/operate/web/facade/ViewFacade.java | 28 +++++++ .../operate/web/result/AmnioResultResult.java | 95 ++++++++++++++++++++++ 6 files changed, 245 insertions(+) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/AmnioResultEnums.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioResultResult.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/AmnioResultEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/AmnioResultEnums.java new file mode 100644 index 0000000..e846dba --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/AmnioResultEnums.java @@ -0,0 +1,65 @@ +package com.lyms.platform.common.enums; + +/** + * Created by Administrator on 2019-10-18. + */ +public enum AmnioResultEnums { + + A("1", "21-三体"), + B("2", "18-三体"), + C("3", "13-三体"), + D("4", "45XO（Turner）"), + E("5", "47XXX(超雌)"), + F("6", "47XXY（克氏）"), + G("7", "47XYY（超雄）"), + H("8", "22q11.2片段的微缺失"), + I("9", "22q11.2片段的微重复"), + J("10", "15q11-q13缺失"), + K("11", "7q11.23（7号长臂近着丝端片段）"), + L("12", "15q11.2-q13缺失"), + M("13", "5号短臂5-40Mb不等的缺失"), + N("14", "Xp22.3"), + O("15", "脊髓性肌肉萎缩症"), + P("16", "DMD"), + Q("17", "脆性X综合征"), + R("18", "其他"); + + + AmnioResultEnums(String id, String name) { + this.id = id; + this.name = name; + } + + private String id; + private String name; + + public static String getName(String id) { + if(id == null) { + return ""; + } + AmnioResultEnums[] values = AmnioResultEnums.values(); + for (AmnioResultEnums value : values) { + if (value.getId().equals(id)) { + return value.getName(); + } + } + return ""; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisResultModel.java index d934c41..39c9add 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisResultModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AmniocentesisResultModel.java @@ -2,7 +2,9 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.utils.DateUtil; import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -24,9 +26,12 @@ public class AmniocentesisResultModel extends BaseModel { private String id; + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date created; //记录日期 + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date recordDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date modified; //创建用户 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AmniocentesisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AmniocentesisController.java index ff60656..aeaa9ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AmniocentesisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AmniocentesisController.java @@ -163,4 +163,36 @@ public class AmniocentesisController extends BaseController { } + /** + * 查看羊穿结果 + * @param request + * @param id + * @return + */ + @TokenRequired + @ResponseBody + @RequestMapping(value = "/queryAmnioResultView", method = RequestMethod.GET) + public BaseResponse queryAmnioResultView(HttpServletRequest request, + @RequestParam(required = true) String id) { + return amniocentesisFacade.queryAmnioResultView(id, getUserId(request)); + + } + + + /** + * 根据id查询结果 + * @param request + * @param id + * @return + */ + @TokenRequired + @ResponseBody + @RequestMapping(value = "/queryAmnioResultById", method = RequestMethod.GET) + public BaseResponse queryAmnioResultById(HttpServletRequest request, + @RequestParam(required = true) String id) { + return amniocentesisFacade.queryAmnioResultById(id, getUserId(request)); + + } + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java index 7236450..dd594f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java @@ -15,6 +15,7 @@ import com.lyms.platform.operate.web.request.AmnioRecordRequest; import com.lyms.platform.operate.web.request.AmnioResultRequest; import com.lyms.platform.operate.web.request.AmniocentesisInfoRequest; import com.lyms.platform.operate.web.request.AmniocentesisQueryRequest; +import com.lyms.platform.operate.web.result.AmnioResultResult; import com.lyms.platform.operate.web.result.AmniocentesisInfo; import com.lyms.platform.operate.web.result.AmniocentesisInfoView; import com.lyms.platform.operate.web.utils.ResponseUtil; @@ -403,4 +404,23 @@ public class AmniocentesisFacade { } return datas; } + + public BaseResponse queryAmnioResultView(String id, Integer userId) { + AmniocentesisResultQuery amniocentesisResultQuery = new AmniocentesisResultQuery(); + amniocentesisResultQuery.setId(id); + AmniocentesisResultModel resultModel = amniocentesisResultService.queryOne(amniocentesisResultQuery); + AmnioResultResult resultResult = null; + if (resultModel != null) + { + resultResult = viewFacade.getAmnioResultView(resultModel); + } + return new BaseObjectResponse().setData(resultResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + } + + public BaseResponse queryAmnioResultById(String id, Integer userId) { + AmniocentesisResultQuery amniocentesisResultQuery = new AmniocentesisResultQuery(); + amniocentesisResultQuery.setId(id); + AmniocentesisResultModel resultModel = amniocentesisResultService.queryOne(amniocentesisResultQuery); + return new BaseObjectResponse().setData(resultModel).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + } } 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 8af0292..4c7615b 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 @@ -203,6 +203,34 @@ public class ViewFacade { } + + public AmnioResultResult getAmnioResultView(AmniocentesisResultModel destModel) { + AmnioResultResult data = new AmnioResultResult(); + data.convertToResult(destModel); + + String hospital = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(destModel.getHospitalId())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + hospital = organization.getName(); + } + } + data.setHospitalName(hospital); + + //医生 + String user = ""; + if (destModel.getUserId() != null) { + Users users = usersService.getUsers(destModel.getUserId()); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + user = users.getName(); + } + } + data.setUserName(user); + + return data; + } + + public Map getPatientViewData(Patients data, String id) { Map map = new HashMap<>(); map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioResultResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioResultResult.java new file mode 100644 index 0000000..792ef7b --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioResultResult.java @@ -0,0 +1,95 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.enums.AmnioResultEnums; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.AmniocentesisInfoModel; +import com.lyms.platform.pojo.AmniocentesisResultModel; + +import java.util.Date; + + +/** + * Created by Administrator on 2019-10-14. + */ +public class AmnioResultResult implements IBasicResultConvert { + + //记录日期 + private String recordDate; + + //创建用户 + private String userName; + + //创建机构 + private String hospitalName; + + //羊水染色体结果 1阴性 2阳性 + private String result; + + //阳性结果选择 + private String resultSelect; + + + //其他阳性结果备注框 + private String otherRemark; + + + @Override + public AmnioResultResult convertToResult(AmniocentesisResultModel destModel) { + + setRecordDate(DateUtil.getyyyy_MM_dd(destModel.getRecordDate())); + setResult(destModel.getResult() == null ? "" : "1".equals(destModel.getResult()) ? "阴性" : "阳性"); //1阴性 2阳性 + setOtherRemark(destModel.getOtherRemark()); + setResultSelect(AmnioResultEnums.getName(destModel.getResultSelect())); + + return this; + } + + public String getRecordDate() { + return recordDate; + } + + public void setRecordDate(String recordDate) { + this.recordDate = recordDate; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getResultSelect() { + return resultSelect; + } + + public void setResultSelect(String resultSelect) { + this.resultSelect = resultSelect; + } + + public String getOtherRemark() { + return otherRemark; + } + + public void setOtherRemark(String otherRemark) { + this.otherRemark = otherRemark; + } +} -- 1.8.3.1