diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 0ca7fd1..5dcdf94 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -178,6 +178,20 @@ public class AntenatalExaminationController extends BaseController { } /** + * 复诊 上传 患者签名 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/antexmanageSign") + @ResponseBody + @TokenRequired + public BaseResponse addOneAntenatalExaminationSign(String patientSign, String id, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseResponse baseResponse = antenatalExaminationFacade.antexmanageSign(patientSign, id); + return baseResponse; + } + + /** * 增加产前检查(初诊) * * @param antExcAddRequest diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index f120fd6..ebd393f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -322,6 +322,9 @@ public class AntenatalExaminationFacade { // } AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); + model.setDoctorSign(antExAddRequest.getDoctorSign()); + model.setPatientSign(antExAddRequest.getPatientSign()); + //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { //建立隐藏档案 @@ -439,6 +442,23 @@ public class AntenatalExaminationFacade { } /** + * 复诊 上传 患者签名 + + * @Author: 武涛涛 + * @Date: 2020/12/15 15:12 + */ + public BaseResponse antexmanageSign(String patientSign, String id) { + AntenatalExaminationModel model = new AntenatalExaminationModel(); + model.setPatientSign(patientSign); + if (StringUtils.isNotEmpty(id)) { + antenatalExaminationService.updateOneAnt(model, id); + }else { + return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + /** * 复诊数据自动流转 * * @param antExamModel @@ -4073,43 +4093,48 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(id)) { score = 0; for (String i : id) { - basicConfigQuery.setId(i); - List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); - if (CollectionUtils.isNotEmpty(basicConfigs)) { - for (BasicConfig basicConfig : basicConfigs) { - Map map = new HashMap<>(); - map.put("id", basicConfig.getId()); - map.put("name", basicConfig.getName()); - map.put("code", basicConfig.getCode()); - basicConfigQuery.setId(basicConfig.getParentId()); - List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); - if (CollectionUtils.isNotEmpty(basicConfigs2)) { - for (BasicConfig bc : basicConfigs2) { - String name = bc.getName(); - if (name.indexOf("黄色") > -1) { - name = "黄色"; - } else if (name.indexOf("橙色") > -1) { - name = "橙色"; - } else if (name.indexOf("红色") > -1) { - name = "红色"; - } else if (name.indexOf("紫色") > -1) { - name = "紫色"; + if(StringUtils.isNotEmpty(i)){ + basicConfigQuery.setId(i); + List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigs)) { + for (BasicConfig basicConfig : basicConfigs) { + Map map = new HashMap<>(); + map.put("id", basicConfig.getId()); + map.put("name", basicConfig.getName()); + map.put("code", basicConfig.getCode()); + basicConfigQuery.setId(basicConfig.getParentId()); + List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigs2)) { + for (BasicConfig bc : basicConfigs2) { + if(StringUtils.isNotEmpty(bc.getName())){ + String name = bc.getName(); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + } else if (name.indexOf("橙色") > -1) { + name = "橙色"; + } else if (name.indexOf("红色") > -1) { + name = "红色"; + } else if (name.indexOf("紫色") > -1) { + name = "紫色"; + } + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + } + } - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } - } - if (StringUtils.isNotEmpty(basicConfig.getCode())) { - score += NumberUtils.toInt(basicConfig.getCode(), 0); - } - if (n) { - BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); - if (null != basicConfig1) { - Map map1 = new HashMap<>(); - basicConfig1.replenRisk(map1); - dat1a.add(map1); + if (StringUtils.isNotEmpty(basicConfig.getCode())) { + score += NumberUtils.toInt(basicConfig.getCode(), 0); + } + if (n) { + BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); + if (null != basicConfig1) { + Map map1 = new HashMap<>(); + basicConfig1.replenRisk(map1); + dat1a.add(map1); + } } + data.add(map); } - data.add(map); } } } 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 f11ff6a..fc8f28b 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 @@ -17,7 +17,11 @@ import java.util.Map; */ @Form public class AntExAddRequest implements IBasicRequestConvert { + //医生签名 + private String doctorSign; + //患者签名 + private String patientSign; /** * start * 遵化需求新增字段 @@ -998,6 +1002,22 @@ public class AntExAddRequest implements IBasicRequestConvert