Merge branch 'dev-1.0.9' into dev-1.1.0

src/main/java/cn/hnthyy/thmz/controller/MzyReqrecController.java

@@ -46,8 +46,10 @@ public class MzyReqrecController {
     private MzZdWorkTimeService mzZdWorkTimeService;
     @Autowired
     private MzyZdChargeTypeService mzyZdChargeTypeService;
+
     /**
      * 保存挂号信息
+     *
      * @return
      */
     @UserLoginToken
@@ -55,49 +57,49 @@ public class MzyReqrecController {
     public Map<String, Object> saveMzyReqrec(@RequestBody MzyReqrecPageDto mzyReqrecPageDto, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if(mzyReqrecPageDto==null || mzyReqrecPageDto.getMzyReqrec()==null){
+            if (mzyReqrecPageDto == null || mzyReqrecPageDto.getMzyReqrec() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号参数不能为空");
                 return resultMap;
             }
             MzyReqrec mzyReqrec = mzyReqrecPageDto.getMzyReqrec();
-            if(StringUtils.isBlank(mzyReqrec.getPatientId())){
+            if (StringUtils.isBlank(mzyReqrec.getPatientId())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人id不能为空");
                 return resultMap;
             }
-            if(StringUtils.isBlank(mzyReqrec.getAmpm())){
+            if (StringUtils.isBlank(mzyReqrec.getAmpm())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号时间段不能为空");
                 return resultMap;
             }
-            if(StringUtils.isBlank(mzyReqrec.getUnitCode())){
+            if (StringUtils.isBlank(mzyReqrec.getUnitCode())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "科室编码不能为空");
                 return resultMap;
             }
-            if(StringUtils.isBlank(mzyReqrec.getChargeType())){
+            if (StringUtils.isBlank(mzyReqrec.getChargeType())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "号别不能为空");
                 return resultMap;
             }
-            if(StringUtils.isBlank(mzyReqrec.getPaymode())){
+            if (StringUtils.isBlank(mzyReqrec.getPaymode())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "付款方式不能为空");
                 return resultMap;
             }
-            if(StringUtils.isBlank(mzyReqrecPageDto.getResponceType())){
+            if (StringUtils.isBlank(mzyReqrecPageDto.getResponceType())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人性质不能为空");
                 return resultMap;
             }
-            if(mzyReqrecPageDto.getMzyRequestId()==null){
+            if (mzyReqrecPageDto.getMzyRequestId() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "门诊号表主键不能为空");
                 return resultMap;
             }
-            MzZdWorkTime mzZdWorkTime=mzZdWorkTimeService.queryMzZdWorkTimeByCode(mzyReqrec.getAmpm());
-            if(mzZdWorkTime==null){
+            MzZdWorkTime mzZdWorkTime = mzZdWorkTimeService.queryMzZdWorkTimeByCode(mzyReqrec.getAmpm());
+            if (mzZdWorkTime == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "号段不存在");
                 return resultMap;
@@ -111,11 +113,11 @@ public class MzyReqrecController {
                 resultMap.put("message", "查询窗口号失败,用户Token不存在");
                 return resultMap;
             }
-            DecodedJWT decodedJWT=TokenUtil.parseJWT(token);
-            User tokenUser=(User)JsonUtil.jsontoObject(decodedJWT.getSubject(),User.class);
+            DecodedJWT decodedJWT = TokenUtil.parseJWT(token);
+            User tokenUser = (User) JsonUtil.jsontoObject(decodedJWT.getSubject(), User.class);
             mzyReqrec.setOpId(tokenUser.getUserIdCode());
-            int num =mzyReqrecService.saveMzyReqrec(mzyReqrecPageDto);
-            if(num==0){
+            int num = mzyReqrecService.saveMzyReqrec(mzyReqrecPageDto);
+            if (num == 0) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号失败，请稍后重试！");
                 return resultMap;
@@ -123,25 +125,26 @@ public class MzyReqrecController {
             resultMap.put("code", 0);
             resultMap.put("message", "保存挂号信息成功");
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
-            resultMap.put("message", StringUtils.isBlank(e.getMessage())?"挂号失败，系统出错，请联系管理员":e.getMessage());
-            log.error("挂号失败，系统异常，错误信息{}",e.getMessage());
+            resultMap.put("message", StringUtils.isBlank(e.getMessage()) ? "挂号失败，系统出错，请联系管理员" : e.getMessage());
+            log.error("挂号失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }
 
     /**
      * 校验挂号时段的选择是否合理
+     *
      * @param resultMap
      * @param mzZdWorkTime
      * @return
      * @throws ParseException
      */
     private boolean checkWorkTime(Map<String, Object> resultMap, MzZdWorkTime mzZdWorkTime) throws ParseException {
-        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("HH:mm");
-       //挂还开始时间取当前时间前15分钟
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm");
+        //挂还开始时间取当前时间前15分钟
         Date now = DateUtil.getMinuteAfterDate(15);
 //        if (Constants.PM.equals(mzZdWorkTime.getCode())){
 //            now= DateUtil.getMinuteAfterDate(10);
@@ -154,18 +157,18 @@ public class MzyReqrecController {
         String realNowStr = simpleDateFormat.format(realNow);
         Date realHour = simpleDateFormat.parse(realNowStr);
         long realHourTs = realHour.getTime();
-        Date dateStartTime=simpleDateFormat.parse(mzZdWorkTime.getStartTime());
-        long tsStartTime =dateStartTime.getTime();
-        Date dateEndTime=simpleDateFormat.parse(mzZdWorkTime.getEndTime());
-        long tsEndTime =dateEndTime.getTime();
-        if(Constants.AM.equals(mzZdWorkTime.getCode())){
-            if(hourTs<tsStartTime || realHourTs>tsEndTime){
+        Date dateStartTime = simpleDateFormat.parse(mzZdWorkTime.getStartTime());
+        long tsStartTime = dateStartTime.getTime();
+        Date dateEndTime = simpleDateFormat.parse(mzZdWorkTime.getEndTime());
+        long tsEndTime = dateEndTime.getTime();
+        if (Constants.AM.equals(mzZdWorkTime.getCode())) {
+            if (hourTs < tsStartTime || realHourTs > tsEndTime) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号失败，当前挂号时间与所选时段不符，请重新选择合适的号段！");
                 return true;
             }
-        }else if (Constants.PM.equals(mzZdWorkTime.getCode())){
-            if(realHourTs>tsEndTime){
+        } else if (Constants.PM.equals(mzZdWorkTime.getCode())) {
+            if (realHourTs > tsEndTime) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号失败，当前挂号时间与所选时段不符，请重新选择合适的号段！");
                 return true;
@@ -177,39 +180,40 @@ public class MzyReqrecController {
 
     /**
      * 导出挂号列表
+     *
      * @return
      */
     @RequestMapping(value = "/exportListMzyReqrec", method = {RequestMethod.GET})
-    public Map<String, Object> exportListMzyReqrec(@RequestParam("name") String name,@RequestParam("unitCode") String unitCode,@RequestParam("doctorCode") String doctorCode,
-                                                   @RequestParam("phoneNo") String phoneNo,@RequestParam("serialNo") String serialNo, @RequestParam("beginTime") String beginTime,
-                                                   @RequestParam("endTime") String endTime , @RequestParam("visitedMark") String visitedMark, @RequestParam("cancelMark") String cancelMark, HttpServletRequest request, HttpServletResponse response) {
+    public Map<String, Object> exportListMzyReqrec(@RequestParam("name") String name, @RequestParam("unitCode") String unitCode, @RequestParam("doctorCode") String doctorCode,
+                                                   @RequestParam("phoneNo") String phoneNo, @RequestParam("serialNo") String serialNo, @RequestParam("beginTime") String beginTime,
+                                                   @RequestParam("endTime") String endTime, @RequestParam("visitedMark") String visitedMark, @RequestParam("cancelMark") String cancelMark, HttpServletRequest request, HttpServletResponse response) {
         try {
             MzyReqrecPageDto mzyReqrecPageDto = new MzyReqrecPageDto();
             mzyReqrecPageDto.setMzyReqrec(new MzyReqrec());
-            MzyReqrec mzyReqrec=mzyReqrecPageDto.getMzyReqrec();
+            MzyReqrec mzyReqrec = mzyReqrecPageDto.getMzyReqrec();
             mzyReqrec.setName(name);
             mzyReqrec.setUnitCode(unitCode);
             mzyReqrec.setDoctorCode(doctorCode);
-            mzyReqrec.setSerialNo(StringUtils.isBlank(serialNo)?null:Integer.valueOf(serialNo));
-            mzyReqrec.setVisitedMark(StringUtils.isBlank(visitedMark)?null:Integer.valueOf(visitedMark));
-            mzyReqrec.setCancelMark(StringUtils.isBlank(cancelMark)?null:Integer.valueOf(cancelMark));
+            mzyReqrec.setSerialNo(StringUtils.isBlank(serialNo) ? null : Integer.valueOf(serialNo));
+            mzyReqrec.setVisitedMark(StringUtils.isBlank(visitedMark) ? null : Integer.valueOf(visitedMark));
+            mzyReqrec.setCancelMark(StringUtils.isBlank(cancelMark) ? null : Integer.valueOf(cancelMark));
             mzyReqrecPageDto.setPhoneNo(phoneNo);
             mzyReqrecPageDto.setBeginTime(DateUtil.pase(beginTime, "yyyy-MM-dd HH:mm:ss"));
             mzyReqrecPageDto.setEndTime(DateUtil.pase(endTime, "yyyy-MM-dd HH:mm:ss"));
-            if(StringUtils.isBlank(mzyReqrec.getName())){
+            if (StringUtils.isBlank(mzyReqrec.getName())) {
                 mzyReqrec.setName(null);
-            }else {
-                mzyReqrec.setName("%"+mzyReqrec.getName()+"%");
+            } else {
+                mzyReqrec.setName("%" + mzyReqrec.getName() + "%");
             }
-            if(StringUtils.isBlank(mzyReqrec.getUnitCode())){
+            if (StringUtils.isBlank(mzyReqrec.getUnitCode())) {
                 mzyReqrec.setUnitCode(null);
             }
-            if(StringUtils.isBlank(mzyReqrec.getDoctorCode())){
+            if (StringUtils.isBlank(mzyReqrec.getDoctorCode())) {
                 mzyReqrec.setDoctorCode(null);
             }
-            if(StringUtils.isNotBlank(mzyReqrecPageDto.getPhoneNo())){
-                List<MzPatientMi> mzPatientMis=mzPatientMiService.queryByPhoneNo(mzyReqrecPageDto.getPhoneNo());
-                if(mzPatientMis==null || mzPatientMis.size()==0){
+            if (StringUtils.isNotBlank(mzyReqrecPageDto.getPhoneNo())) {
+                List<MzPatientMi> mzPatientMis = mzPatientMiService.queryByPhoneNo(mzyReqrecPageDto.getPhoneNo());
+                if (mzPatientMis == null || mzPatientMis.size() == 0) {
                     return null;
                 }
                 List<String> patientIds = mzPatientMis.stream().filter(u -> StringUtils.isNotBlank(u.getPatientId())).map(u -> u.getPatientId()).collect(Collectors.toList());
@@ -219,17 +223,16 @@ public class MzyReqrecController {
             mzyReqrecPageDto.setPageSize(count);
             ExcelUtil.exportExcelForReqrecList(request, response, getMzyReqrecVo(mzyReqrecService.queryMzyReqrecWithPage(mzyReqrecPageDto)));
             return null;
-        }catch (Exception e){
-            log.error("导出挂号列表失败，系统异常，错误信息{}",e.getMessage());
+        } catch (Exception e) {
+            log.error("导出挂号列表失败，系统异常，错误信息{}", e.getMessage());
             return null;
         }
     }
 
 
-
-
     /**
      * 查询挂号列表
+     *
      * @return
      */
     @UserLoginToken
@@ -237,27 +240,27 @@ public class MzyReqrecController {
     public Map<String, Object> listMzyReqrec(@RequestBody MzyReqrecPageDto mzyReqrecPageDto) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if(mzyReqrecPageDto==null || mzyReqrecPageDto.getMzyReqrec()==null){
+            if (mzyReqrecPageDto == null || mzyReqrecPageDto.getMzyReqrec() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号查询参数不能为空");
                 return resultMap;
             }
-            MzyReqrec mzyReqrec=mzyReqrecPageDto.getMzyReqrec();
-            if(StringUtils.isBlank(mzyReqrec.getName())){
+            MzyReqrec mzyReqrec = mzyReqrecPageDto.getMzyReqrec();
+            if (StringUtils.isBlank(mzyReqrec.getName())) {
                 mzyReqrec.setName(null);
-            }else {
-                mzyReqrec.setName("%"+mzyReqrec.getName()+"%");
+            } else {
+                mzyReqrec.setName("%" + mzyReqrec.getName() + "%");
             }
-            if(StringUtils.isBlank(mzyReqrec.getUnitCode())){
+            if (StringUtils.isBlank(mzyReqrec.getUnitCode())) {
                 mzyReqrec.setUnitCode(null);
             }
-            if(StringUtils.isBlank(mzyReqrec.getDoctorCode())){
+            if (StringUtils.isBlank(mzyReqrec.getDoctorCode())) {
                 mzyReqrec.setDoctorCode(null);
             }
             PageViewVo pageViewVo = new PageViewVo(mzyReqrecPageDto.getPageIndex(), mzyReqrecPageDto.getPageSize());
-            if(StringUtils.isNotBlank(mzyReqrecPageDto.getPhoneNo())){
-                List<MzPatientMi> mzPatientMis=mzPatientMiService.queryByPhoneNo(mzyReqrecPageDto.getPhoneNo());
-                if(mzPatientMis==null || mzPatientMis.size()==0){
+            if (StringUtils.isNotBlank(mzyReqrecPageDto.getPhoneNo())) {
+                List<MzPatientMi> mzPatientMis = mzPatientMiService.queryByPhoneNo(mzyReqrecPageDto.getPhoneNo());
+                if (mzPatientMis == null || mzPatientMis.size() == 0) {
                     pageViewVo.setTotal(0);
                     pageViewVo.setData(Collections.EMPTY_LIST);
                     resultMap.put("code", 0);
@@ -269,25 +272,25 @@ public class MzyReqrecController {
                 mzyReqrecPageDto.setPatientIds(patientIds);
             }
             Integer count = mzyReqrecService.countMzyReqrec(mzyReqrecPageDto);
-            pageViewVo.setTotal(count==null?0:count);
+            pageViewVo.setTotal(count == null ? 0 : count);
             pageViewVo.setData(getMzyReqrecVo(mzyReqrecService.queryMzyReqrecWithPage(mzyReqrecPageDto)));
             resultMap.put("code", 0);
             resultMap.put("message", "查询挂号信息成功");
             resultMap.put("pageViewVo", pageViewVo);
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "查询挂号列表失败，系统出错，请联系管理员");
-            log.error("查询挂号列表失败，系统异常，错误信息{}",e.getMessage());
+            log.error("查询挂号列表失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }
 
 
-
     /**
      * 查询挂号中，已就诊人数，退号人次
+     *
      * @return
      */
     @UserLoginToken
@@ -295,26 +298,26 @@ public class MzyReqrecController {
     public Map<String, Object> getCountByParams(@RequestBody MzyReqrecPageDto mzyReqrecPageDto) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if(mzyReqrecPageDto==null || mzyReqrecPageDto.getMzyReqrec()==null){
+            if (mzyReqrecPageDto == null || mzyReqrecPageDto.getMzyReqrec() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号统计查询参数不能为空");
                 return resultMap;
             }
-            MzyReqrec mzyReqrec=mzyReqrecPageDto.getMzyReqrec();
-            if(StringUtils.isBlank(mzyReqrec.getName())){
+            MzyReqrec mzyReqrec = mzyReqrecPageDto.getMzyReqrec();
+            if (StringUtils.isBlank(mzyReqrec.getName())) {
                 mzyReqrec.setName(null);
-            }else {
-                mzyReqrec.setName("%"+mzyReqrec.getName()+"%");
+            } else {
+                mzyReqrec.setName("%" + mzyReqrec.getName() + "%");
             }
-            if(StringUtils.isBlank(mzyReqrec.getUnitCode())){
+            if (StringUtils.isBlank(mzyReqrec.getUnitCode())) {
                 mzyReqrec.setUnitCode(null);
             }
-            if(StringUtils.isBlank(mzyReqrec.getDoctorCode())){
+            if (StringUtils.isBlank(mzyReqrec.getDoctorCode())) {
                 mzyReqrec.setDoctorCode(null);
             }
-            if(StringUtils.isNotBlank(mzyReqrecPageDto.getPhoneNo())){
-                List<MzPatientMi> mzPatientMis=mzPatientMiService.queryByPhoneNo(mzyReqrecPageDto.getPhoneNo());
-                if(mzPatientMis==null || mzPatientMis.size()==0){
+            if (StringUtils.isNotBlank(mzyReqrecPageDto.getPhoneNo())) {
+                List<MzPatientMi> mzPatientMis = mzPatientMiService.queryByPhoneNo(mzyReqrecPageDto.getPhoneNo());
+                if (mzPatientMis == null || mzPatientMis.size() == 0) {
                     resultMap.put("code", 0);
                     resultMap.put("message", "查询挂号统计信息成功");
                     resultMap.put("registrationNum", 0);
@@ -336,15 +339,15 @@ public class MzyReqrecController {
             Integer backNoNum = mzyReqrecService.countMzyReqrec(mzyReqrecPageDto);
             resultMap.put("code", 0);
             resultMap.put("message", "查询挂号统计信息成功");
-            resultMap.put("registrationNum", registrationNum==null?0:registrationNum);
-            resultMap.put("haveClinicalNum", haveClinicalNum==null?0:haveClinicalNum);
-            resultMap.put("backNoNum", backNoNum==null?0:backNoNum);
+            resultMap.put("registrationNum", registrationNum == null ? 0 : registrationNum);
+            resultMap.put("haveClinicalNum", haveClinicalNum == null ? 0 : haveClinicalNum);
+            resultMap.put("backNoNum", backNoNum == null ? 0 : backNoNum);
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "查询挂号统计失败，系统出错，请联系管理员");
-            log.error("查询挂号统计失败，系统异常，错误信息{}",e.getMessage());
+            log.error("查询挂号统计失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }
@@ -352,112 +355,113 @@ public class MzyReqrecController {
 
     /**
      * 构造包含病人信息的挂号记录视图
+     *
      * @param mzyReqrecs
      * @return
      */
-    private List<MzyReqrecVo> getMzyReqrecVo(List<MzyReqrec> mzyReqrecs){
-        List<MzyReqrecVo> mzyReqrecVos= new ArrayList<>();
-        if(mzyReqrecs==null){
+    private List<MzyReqrecVo> getMzyReqrecVo(List<MzyReqrec> mzyReqrecs) {
+        List<MzyReqrecVo> mzyReqrecVos = new ArrayList<>();
+        if (mzyReqrecs == null) {
             return mzyReqrecVos;
         }
         Set<String> patientIds = mzyReqrecs.stream().map(u -> u.getPatientId()).collect(Collectors.toSet());
-        List<MzPatientMi> mzPatientMis=new ArrayList<>();
-        if(patientIds!=null && patientIds.size()>0){
+        List<MzPatientMi> mzPatientMis = new ArrayList<>();
+        if (patientIds != null && patientIds.size() > 0) {
             List<String> temp = new ArrayList<>();
-            int num=0;
-            for (String str:patientIds){
+            int num = 0;
+            for (String str : patientIds) {
                 temp.add(str);
                 num++;
-                if(num==200){
+                if (num == 200) {
                     mzPatientMis.addAll(mzPatientMiService.queryByPatientIds(temp));
                     temp = new ArrayList<>();
-                    num=0;
+                    num = 0;
                 }
             }
-            if(num>0){
+            if (num > 0) {
                 mzPatientMis.addAll(mzPatientMiService.queryByPatientIds(temp));
             }
         }
-        if(mzPatientMis!=null){
-            List<ResponceType> responceTypes=responceTypeService.queryAllMzResponceType();
-            if(responceTypes!=null){
-                Map<String, String> responceTypeMap=responceTypes.stream().collect(Collectors.toMap(ResponceType::getCode, ResponceType::getName));
-                if(responceTypeMap!=null){
-                    for (MzPatientMi mzPatientMi:mzPatientMis){
+        if (mzPatientMis != null) {
+            List<ResponceType> responceTypes = responceTypeService.queryAllMzResponceType();
+            if (responceTypes != null) {
+                Map<String, String> responceTypeMap = responceTypes.stream().collect(Collectors.toMap(ResponceType::getCode, ResponceType::getName));
+                if (responceTypeMap != null) {
+                    for (MzPatientMi mzPatientMi : mzPatientMis) {
                         mzPatientMi.setResponseType(responceTypeMap.get(mzPatientMi.getResponseType()));
                     }
                 }
             }
         }
-        Map<String, MzPatientMi> mzPatientMiMap=null;
-        if(mzPatientMis!=null){
-            mzPatientMiMap=mzPatientMis.stream().collect(Collectors.toMap(MzPatientMi::getPatientId, mzPatientMi -> mzPatientMi));
+        Map<String, MzPatientMi> mzPatientMiMap = null;
+        if (mzPatientMis != null) {
+            mzPatientMiMap = mzPatientMis.stream().collect(Collectors.toMap(MzPatientMi::getPatientId, mzPatientMi -> mzPatientMi));
         }
         Set<String> doctorCodes = mzyReqrecs.stream().map(u -> u.getDoctorCode()).collect(Collectors.toSet());
-        List<Employee> employees=new ArrayList<>();
-        if(doctorCodes!=null && doctorCodes.size()>0){
+        List<Employee> employees = new ArrayList<>();
+        if (doctorCodes != null && doctorCodes.size() > 0) {
             List<String> temp = new ArrayList<>();
-            int num=0;
-            for (String str:doctorCodes){
+            int num = 0;
+            for (String str : doctorCodes) {
                 temp.add(str);
                 num++;
-                if(num==200){
+                if (num == 200) {
                     employees.addAll(employeeService.queryByCodes(temp));
                     temp = new ArrayList<>();
-                    num=0;
+                    num = 0;
                 }
             }
-            if(num>0){
+            if (num > 0) {
                 employees.addAll(employeeService.queryByCodes(temp));
             }
         }
-        Map<String, String> employeeMap=null;
-        if(employees!=null){
-            employeeMap= employees.stream().collect(Collectors.toMap(Employee::getEmployeeCode, Employee::getEmployeeName));
+        Map<String, String> employeeMap = null;
+        if (employees != null) {
+            employeeMap = employees.stream().collect(Collectors.toMap(Employee::getEmployeeCode, Employee::getEmployeeName));
         }
-        List<ZdChequeType> chequeTypes=zdChequeTypeService.queryAllZdChequeTypeForMz();
-        Map<String, String> chequeTypeMap=null;
-        if(chequeTypes!=null){
-            chequeTypeMap=chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
+        List<ZdChequeType> chequeTypes = zdChequeTypeService.queryAllZdChequeTypeForMz();
+        Map<String, String> chequeTypeMap = null;
+        if (chequeTypes != null) {
+            chequeTypeMap = chequeTypes.stream().collect(Collectors.toMap(ZdChequeType::getCode, ZdChequeType::getName));
         }
-        List<MzZdWorkTime> workTimes=mzZdWorkTimeService.queryAllMzZdWorkTime();
-        Map<String, String> workTimeMap=null;
-        if(workTimes!=null){
-            workTimeMap=workTimes.stream().collect(Collectors.toMap(MzZdWorkTime::getCode, MzZdWorkTime::getName));
+        List<MzZdWorkTime> workTimes = mzZdWorkTimeService.queryAllMzZdWorkTime();
+        Map<String, String> workTimeMap = null;
+        if (workTimes != null) {
+            workTimeMap = workTimes.stream().collect(Collectors.toMap(MzZdWorkTime::getCode, MzZdWorkTime::getName));
         }
-        List<MzyZdChargeType> mzyZdChargeTypes=mzyZdChargeTypeService.queryAllMzyZdChargeType();
-        Map<String, String> mzyZdChargeTypeMap=null;
-        if(mzyZdChargeTypes!=null){
-            mzyZdChargeTypeMap=mzyZdChargeTypes.stream().collect(Collectors.toMap(MzyZdChargeType::getCode, MzyZdChargeType::getName));
+        List<MzyZdChargeType> mzyZdChargeTypes = mzyZdChargeTypeService.queryAllMzyZdChargeType();
+        Map<String, String> mzyZdChargeTypeMap = null;
+        if (mzyZdChargeTypes != null) {
+            mzyZdChargeTypeMap = mzyZdChargeTypes.stream().collect(Collectors.toMap(MzyZdChargeType::getCode, MzyZdChargeType::getName));
         }
-        for (MzyReqrec mzyReqrec:mzyReqrecs){
-            if(mzyReqrec!=null){
+        for (MzyReqrec mzyReqrec : mzyReqrecs) {
+            if (mzyReqrec != null) {
                 mzyReqrec.setUnitCode(zdUnitCodeService.queryDeptNameByIdInCache(mzyReqrec.getUnitCode()));
-                if(employeeMap!=null){
-                    String doctorCode=employeeMap.get(mzyReqrec.getDoctorCode());
-                    mzyReqrec.setDoctorCode(doctorCode==null?"":doctorCode);
+                if (employeeMap != null) {
+                    String doctorCode = employeeMap.get(mzyReqrec.getDoctorCode());
+                    mzyReqrec.setDoctorCode(doctorCode == null ? "" : doctorCode);
                 }
-                if(chequeTypeMap!=null){
-                    String paymode=chequeTypeMap.get(mzyReqrec.getPaymode());
-                    mzyReqrec.setPaymode(paymode==null?"":paymode);
+                if (chequeTypeMap != null) {
+                    String paymode = chequeTypeMap.get(mzyReqrec.getPaymode());
+                    mzyReqrec.setPaymode(paymode == null ? "" : paymode);
                 }
-                if(workTimeMap!=null){
-                    String workTime=workTimeMap.get(mzyReqrec.getAmpm());
-                    mzyReqrec.setAmpm(workTime==null?"":workTime);
+                if (workTimeMap != null) {
+                    String workTime = workTimeMap.get(mzyReqrec.getAmpm());
+                    mzyReqrec.setAmpm(workTime == null ? "" : workTime);
                 }
-                if(mzyZdChargeTypeMap!=null){
-                    String chargeType=mzyZdChargeTypeMap.get(mzyReqrec.getChargeType());
-                    mzyReqrec.setChargeType(chargeType==null?"":chargeType);
+                if (mzyZdChargeTypeMap != null) {
+                    String chargeType = mzyZdChargeTypeMap.get(mzyReqrec.getChargeType());
+                    mzyReqrec.setChargeType(chargeType == null ? "" : chargeType);
                 }
                 //傻b们写的医生接诊逻辑不设置visitedMark 字段  挂号的时候还设置成已接诊
-                if(mzyReqrec.getVisitDate()!=null){
+                if (mzyReqrec.getVisitDate() != null) {
                     mzyReqrec.setVisitedMark(YesNoEnum.YES.code);
-                }else {
+                } else {
                     mzyReqrec.setVisitedMark(YesNoEnum.NO.code);
                 }
                 MzyReqrecVo mzyReqrecVo = new MzyReqrecVo();
                 mzyReqrecVo.setMzyReqrec(mzyReqrec);
-                if(mzPatientMiMap!=null){
+                if (mzPatientMiMap != null) {
                     mzyReqrecVo.setMzPatientMi(mzPatientMiMap.get(mzyReqrec.getPatientId()));
                 }
                 mzyReqrecVos.add(mzyReqrecVo);
@@ -467,11 +471,9 @@ public class MzyReqrecController {
     }
 
 
-
-
-
     /**
      * 根据病人id查询挂号信息
+     *
      * @return
      */
     @UserLoginToken
@@ -479,25 +481,25 @@ public class MzyReqrecController {
     public Map<String, Object> getMzyReqrecByPatientIdAndTimes(@RequestBody MzyReqrec mzyReqrec) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if(mzyReqrec==null){
+            if (mzyReqrec == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "挂号查询参数不能为空");
                 return resultMap;
             }
-            if(StringUtils.isBlank(mzyReqrec.getPatientId())){
+            if (StringUtils.isBlank(mzyReqrec.getPatientId())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人id不能为空");
                 return resultMap;
             }
-            if(mzyReqrec.getTimes()==null){
+            if (mzyReqrec.getTimes() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人挂号次数不能为空");
                 return resultMap;
             }
-            MzyReqrec result=mzyReqrecService.queryMzyReqrecByPatientIdAndTimes(mzyReqrec.getPatientId(),mzyReqrec.getTimes());
-            if(result!=null){
-                List<MzyReqrecVo> mzyReqrecVos=getMzyReqrecVo(Arrays.asList(result));
-                if(mzyReqrecVos!=null && mzyReqrecVos.size()>0){
+            MzyReqrec result = mzyReqrecService.queryMzyReqrecByPatientIdAndTimes(mzyReqrec.getPatientId(), mzyReqrec.getTimes());
+            if (result != null) {
+                List<MzyReqrecVo> mzyReqrecVos = getMzyReqrecVo(Arrays.asList(result));
+                if (mzyReqrecVos != null && mzyReqrecVos.size() > 0) {
                     resultMap.put("code", 0);
                     resultMap.put("message", "查询挂号信息成功");
                     resultMap.put("data", mzyReqrecVos.get(0));
@@ -507,19 +509,19 @@ public class MzyReqrecController {
             resultMap.put("code", -1);
             resultMap.put("message", "查询挂号信息失败，没有相应的挂号信息");
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "查询挂号信息失败，系统出错，请联系管理员");
-            log.error("查询挂号信息失败，系统异常，错误信息{}",e.getMessage());
+            log.error("查询挂号信息失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }
 
 
-
     /**
      * 更新挂号信息
+     *
      * @return
      */
     @UserLoginToken
@@ -527,30 +529,30 @@ public class MzyReqrecController {
     public Map<String, Object> updateReqrec(@RequestBody MzyReqrec mzyReqrec, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if(mzyReqrec==null){
+            if (mzyReqrec == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "更新挂号信息参数不能为空");
                 return resultMap;
             }
-            if(StringUtils.isBlank(mzyReqrec.getPatientId())){
+            if (StringUtils.isBlank(mzyReqrec.getPatientId())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人id不能为空");
                 return resultMap;
             }
-            if(mzyReqrec.getTimes()==null){
+            if (mzyReqrec.getTimes() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人挂号次数不能为空");
                 return resultMap;
             }
             User tokenUser = TokenUtil.getUser(httpServletRequest);
-            if (tokenUser==null) {
+            if (tokenUser == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询窗口号失败,用户Token不存在");
                 return resultMap;
             }
             mzyReqrec.setOpId(tokenUser.getUserIdCode());
-            int num=mzyReqrecService.modifyMzyReqrec(mzyReqrec,tokenUser);
-            if(num==1){
+            int num = mzyReqrecService.modifyMzyReqrec(mzyReqrec, tokenUser);
+            if (num == 1) {
                 resultMap.put("code", 0);
                 resultMap.put("message", "更新挂号信息成功");
                 return resultMap;
@@ -558,24 +560,24 @@ public class MzyReqrecController {
             resultMap.put("code", -1);
             resultMap.put("message", "更新挂号信息失败");
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "更新挂号信息失败，系统出错，请联系管理员");
-            log.error("更新挂号信息失败，系统异常，错误信息{}",e.getMessage());
+            log.error("更新挂号信息失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }
 
 
-
     /**
      * 打印当前挂号的发票信息
+     *
      * @return
      */
     @UserLoginToken
     @RequestMapping(value = "/printMzyReqrecRecept", method = {RequestMethod.GET})
-    public Map<String, Object> printMzyReqrecRecept(@RequestParam("patientId") String patientId,@RequestParam("times") Integer times, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> printMzyReqrecRecept(@RequestParam("patientId") String patientId, @RequestParam("times") Integer times, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if (StringUtils.isBlank(patientId)) {
@@ -583,114 +585,113 @@ public class MzyReqrecController {
                 resultMap.put("message", "病人编号参数不能为空");
                 return resultMap;
             }
-            if (times==null) {
+            if (times == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人就诊次数不能为空");
                 return resultMap;
             }
             User tokenUser = TokenUtil.getUser(httpServletRequest);
-            if (tokenUser==null) {
+            if (tokenUser == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "打印当前挂号的发票信息失败,用户Token不存在");
                 return resultMap;
             }
             MzyReqrec mzyReqrec;
-            if(times==-1){
-                mzyReqrec=mzyReqrecService.queryLastMzyReqrecByPatientId(patientId);
-            }else {
-                mzyReqrec=mzyReqrecService.queryMzyReqrecByPatientIdAndTimes(patientId,times);
+            if (times == -1) {
+                mzyReqrec = mzyReqrecService.queryLastMzyReqrecByPatientId(patientId);
+            } else {
+                mzyReqrec = mzyReqrecService.queryMzyReqrecByPatientIdAndTimes(patientId, times);
             }
-            if(mzyReqrec==null){
+            if (mzyReqrec == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "当前病人不存在挂号信息");
                 return resultMap;
             }
-            if(StringUtils.isNotBlank(mzyReqrec.getPrinterId())){
+            if (StringUtils.isNotBlank(mzyReqrec.getPrinterId())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "当前挂号信息已经打印过发票，请勿重复操作");
                 return resultMap;
             }
-            if(Constants.BYJZ.equals( mzyReqrec.getPaymode())){
+            if (Constants.BYJZ.equals(mzyReqrec.getPaymode())) {
                 //当前病人没有实际缴费，暂时不打印发票
                 resultMap.put("code", -2);
                 resultMap.put("message", "挂号成功,记账不打发票");
                 log.info("当前病人没有实际缴费，暂时不打印发票，patientId={},time={}", patientId, times);
                 return resultMap;
             }
-            ZdUnitCode zdUnitCode=zdUnitCodeService.queryByCode(mzyReqrec.getUnitCode());
-            if(zdUnitCode!=null){
+            ZdUnitCode zdUnitCode = zdUnitCodeService.queryByCode(mzyReqrec.getUnitCode());
+            if (zdUnitCode != null) {
                 mzyReqrec.setUnitCode(zdUnitCode.getName());
-                resultMap.put("officePos",zdUnitCode.getOfficePos());
+                resultMap.put("officePos", zdUnitCode.getOfficePos());
             }
-            Employee employee=employeeService.queryByUserCode(mzyReqrec.getDoctorCode());
-            if(employee!=null){
+            Employee employee = employeeService.queryByUserCode(mzyReqrec.getDoctorCode());
+            if (employee != null) {
                 mzyReqrec.setDoctorCode(employee.getEmployeeName());
             }
-            MzyZdChargeType mzyZdChargeType=mzyZdChargeTypeService.queryByCode(mzyReqrec.getChargeType());
-            if(mzyZdChargeType!=null){
+            MzyZdChargeType mzyZdChargeType = mzyZdChargeTypeService.queryByCode(mzyReqrec.getChargeType());
+            if (mzyZdChargeType != null) {
                 mzyReqrec.setChargeType(mzyZdChargeType.getName());
             }
-            if("a".equals(mzyReqrec.getAmpm())){
+            if ("a".equals(mzyReqrec.getAmpm())) {
                 mzyReqrec.setAmpm("上午");
-            }else if("p".equals(mzyReqrec.getAmpm())){
+            } else if ("p".equals(mzyReqrec.getAmpm())) {
                 mzyReqrec.setAmpm("下午");
-            }else if("n".equals(mzyReqrec.getAmpm())){
+            } else if ("n".equals(mzyReqrec.getAmpm())) {
                 mzyReqrec.setAmpm("中午");
-            }else if("d".equals(mzyReqrec.getAmpm())){
+            } else if ("d".equals(mzyReqrec.getAmpm())) {
                 mzyReqrec.setAmpm("全天");
             }
             BigDecimal totalFee = mzyReqrec.getReqFee().add(mzyReqrec.getClinicFee()).add(mzyReqrec.getOthFee()).add(mzyReqrec.getBrochureFee());
-            if(totalFee.compareTo(BigDecimal.ZERO)==0){
+            if (totalFee.compareTo(BigDecimal.ZERO) == 0) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "当前病人无费用信息，无需开具发票");
                 return resultMap;
             }
-            resultMap.put("totalFee",totalFee);
-            resultMap.put("totalFeeStr",NumberToCN.number2CNMontrayUnit(totalFee));
-            Date chargeDate=mzyReqrec.getRequestDay();
-            if(chargeDate==null){
-                chargeDate=new Date();
+            resultMap.put("totalFee", totalFee);
+            resultMap.put("totalFeeStr", NumberToCN.number2CNMontrayUnit(totalFee));
+            Date chargeDate = mzyReqrec.getRequestDay();
+            if (chargeDate == null) {
+                chargeDate = new Date();
             }
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(chargeDate);
-            resultMap.put("year",calendar.get(Calendar.YEAR));
-            Integer month=calendar.get(Calendar.MONTH)+1;
-            if(month<10){
-                resultMap.put("month","0"+month);
-            }else {
-                resultMap.put("month",month.toString());
-            }
-            Integer day=calendar.get(Calendar.DAY_OF_MONTH);
-            if(day<10){
-                resultMap.put("day","0"+day);
-            }else {
-                resultMap.put("day",day.toString());
+            resultMap.put("year", calendar.get(Calendar.YEAR));
+            Integer month = calendar.get(Calendar.MONTH) + 1;
+            if (month < 10) {
+                resultMap.put("month", "0" + month);
+            } else {
+                resultMap.put("month", month.toString());
+            }
+            Integer day = calendar.get(Calendar.DAY_OF_MONTH);
+            if (day < 10) {
+                resultMap.put("day", "0" + day);
+            } else {
+                resultMap.put("day", day.toString());
             }
             mzyReqrec.setPrinterId(tokenUser.getUserIdCode());
             mzyReqrecService.printMzyReqrecRecept(mzyReqrec);
             resultMap.put("code", 0);
-            resultMap.put("data",mzyReqrec);
-            resultMap.put("user",tokenUser);
+            resultMap.put("data", mzyReqrec);
+            resultMap.put("user", tokenUser);
             return resultMap;
-        }catch (MzException e){
+        } catch (MzException e) {
             resultMap.put("code", -1);
-            resultMap.put("message", "获取当前挂号的发票信息失败，"+e.getMessage());
-            log.error("获取当前挂号的发票信息失败，系统异常，错误信息{}",e);
+            resultMap.put("message", "获取当前挂号的发票信息失败，" + e.getMessage());
+            log.error("获取当前挂号的发票信息失败，系统异常，错误信息{}", e);
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "获取当前挂号的发票信息失败，系统出错，请联系管理员");
-            log.error("获取当前挂号的发票信息失败，系统异常，错误信息{}",e.getMessage());
+            log.error("获取当前挂号的发票信息失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }
 
 
-
-
     /**
      * 消卡
+     *
      * @return
      */
     @UserLoginToken
@@ -698,13 +699,13 @@ public class MzyReqrecController {
     public Map<String, Object> clearIcCardNo(@RequestParam String patientId) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if(StringUtils.isBlank(patientId)){
+            if (StringUtils.isBlank(patientId)) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "销卡的病人id不能为空");
                 return resultMap;
             }
-            int num=mzPatientMiService.clearIcCardNo(patientId);
-            if(num==1){
+            int num = mzPatientMiService.clearIcCardNo(patientId);
+            if (num == 1) {
                 resultMap.put("code", 0);
                 resultMap.put("message", "销卡成功");
                 return resultMap;
@@ -712,17 +713,16 @@ public class MzyReqrecController {
             resultMap.put("code", -1);
             resultMap.put("message", "销卡失败");
             return resultMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("code", -1);
             resultMap.put("message", "销卡失败，系统出错，请联系管理员");
-            log.error("销卡失败，系统异常，错误信息{}",e.getMessage());
+            log.error("销卡失败，系统异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }
 
 
-
     /**
      * 门诊号别统计表
      *
@@ -761,7 +761,7 @@ public class MzyReqrecController {
             resultMap.put("message", "门诊号别统计表成功");
             List<Map<String, Object>> mzhbCounts = mzyReqrecService.queryMzhbCount(thmzmxsrParamsVo);
 
-            if(mzhbCounts==null || mzhbCounts.size()==0){
+            if (mzhbCounts == null || mzhbCounts.size() == 0) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "没有查询到符合条件的门诊挂号统计信息");
                 return resultMap;
@@ -773,57 +773,57 @@ public class MzyReqrecController {
             //科室列表
             List<Map<String, Object>> depetList = new ArrayList<>();
             //按照科室合计统计
-            Map<String,Map<String,Object>> deptHjMap = new HashMap<>();
+            Map<String, Map<String, Object>> deptHjMap = new HashMap<>();
             //按照号别类型合计统计
-            Map<String,Map<String,Object>> chargeTypeHjMap = new HashMap<>();
-            for(Map<String, Object> map:mzhbCounts){
-                String chargeType=(String) map.get("charge_type");
-                if(!chargeTypeSet.contains(chargeType)){
+            Map<String, Map<String, Object>> chargeTypeHjMap = new HashMap<>();
+            for (Map<String, Object> map : mzhbCounts) {
+                String chargeType = (String) map.get("charge_type");
+                if (!chargeTypeSet.contains(chargeType)) {
                     Map<String, Object> chargeTemp = new HashMap<>();
                     chargeTemp.put("charge_type_name", map.get("charge_type_name"));
-                    chargeTemp.put("charge_type",chargeType);
+                    chargeTemp.put("charge_type", chargeType);
                     chargeTypeList.add(chargeTemp);
                     chargeTypeSet.add(chargeType);
-                    chargeTypeHjMap.put(chargeType,chargeTemp);
+                    chargeTypeHjMap.put(chargeType, chargeTemp);
                 }
-                String unitCode=(String) map.get("unit_code");
-                if(!depetSet.contains(unitCode)){
+                String unitCode = (String) map.get("unit_code");
+                if (!depetSet.contains(unitCode)) {
                     Map<String, Object> deptTemp = new HashMap<>();
-                    deptTemp.put("dept_name",map.get("dept_name"));
-                    deptTemp.put("unit_code",unitCode);
+                    deptTemp.put("dept_name", map.get("dept_name"));
+                    deptTemp.put("unit_code", unitCode);
                     depetList.add(deptTemp);
                     depetSet.add(unitCode);
-                    deptHjMap.put(unitCode,deptTemp);
+                    deptHjMap.put(unitCode, deptTemp);
                 }
-                Map<String,Object> deptMap = deptHjMap.get(unitCode);
+                Map<String, Object> deptMap = deptHjMap.get(unitCode);
                 Integer hshj = (Integer) deptMap.get("hshj");
                 Double jehj = (Double) deptMap.get("jehj");
-                if(hshj==null){
-                    hshj= 0;
+                if (hshj == null) {
+                    hshj = 0;
                 }
-                if(jehj==null){
-                    jehj=0D;
+                if (jehj == null) {
+                    jehj = 0D;
                 }
-               Integer patientCount= (Integer) map.get("patient_count");
-                Double reqFee=((Double)map.get("req_fee"));
-                hshj=hshj+patientCount;
-                jehj=jehj+reqFee;
-                deptMap.put("hshj",hshj);
-                deptMap.put("jehj",jehj);
-
-                Map<String,Object> chargeMap = chargeTypeHjMap.get(chargeType);
+                Integer patientCount = (Integer) map.get("patient_count");
+                Double reqFee = ((Double) map.get("req_fee"));
+                hshj = hshj + patientCount;
+                jehj = jehj + reqFee;
+                deptMap.put("hshj", hshj);
+                deptMap.put("jehj", jehj);
+
+                Map<String, Object> chargeMap = chargeTypeHjMap.get(chargeType);
                 Integer chargeHshj = (Integer) chargeMap.get("chargeHshj");
                 Double chargeHehj = (Double) chargeMap.get("chargeHehj");
-                if(chargeHshj==null){
-                    chargeHshj= 0;
+                if (chargeHshj == null) {
+                    chargeHshj = 0;
                 }
-                if(chargeHehj==null){
-                    chargeHehj=0D;
+                if (chargeHehj == null) {
+                    chargeHehj = 0D;
                 }
-                chargeHshj=chargeHshj+patientCount;
-                chargeHehj=chargeHehj+reqFee;
-                chargeMap.put("chargeHshj",chargeHshj);
-                chargeMap.put("chargeHehj",chargeHehj);
+                chargeHshj = chargeHshj + patientCount;
+                chargeHehj = chargeHehj + reqFee;
+                chargeMap.put("chargeHshj", chargeHshj);
+                chargeMap.put("chargeHehj", chargeHehj);
             }
             resultMap.put("depetList", depetList);
             resultMap.put("chargeTypeList", chargeTypeList);

src/main/java/cn/hnthyy/thmz/entity/his/CovidPojo.java

@@ -0,0 +1,26 @@
+package cn.hnthyy.thmz.entity.his;
+
+import lombok.Data;
+
+/**
+ * 发热筛查
+ */
+@Data
+public class CovidPojo {
+    private String name;
+    private String phone;
+    private String idcard;
+    private Integer addrProvince;
+    private Integer addrCity;
+    private Integer addrDistrict;
+    private String addrAdditional;
+    private Integer temperature;
+    private String feverNumber;
+    private String date;
+    private Integer item1;
+    private Integer item2;
+    private Integer item3;
+    private Integer item4;
+    private Integer item5;
+    private String patientId;
+}

src/main/java/cn/hnthyy/thmz/mapper/his/CovidPojoMapper.java

@@ -0,0 +1,15 @@
+package cn.hnthyy.thmz.mapper.his;
+
+import cn.hnthyy.thmz.entity.his.CovidPojo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+public interface CovidPojoMapper {
+    /**
+     * 根据病人身份证号码查询最近三天的流行性病调查
+     * @param idcard
+     * @return
+     */
+    @Select(" select  top 1 * from  t_covid19_assessment where (idcard=#{idcard} or  patient_id =#{patientId})and date>=DateAdd(Day,-3,GETDATE()) order by date desc  ")
+    CovidPojo selectLastCovidPojoByIdcard(@Param("idcard") String idcard,@Param("patientId") String patientId);
+}

src/main/java/cn/hnthyy/thmz/service/impl/his/MzyReqrecServiceImpl.java

@@ -13,13 +13,11 @@ import cn.hnthyy.thmz.mapper.thmz.ReqrecRequestRelationMapper;
 import cn.hnthyy.thmz.mapper.thmz.WindowsMapper;
 import cn.hnthyy.thmz.service.his.*;
 import cn.hnthyy.thmz.pageDto.MzyReqrecPageDto;
-import cn.hnthyy.thmz.service.thmz.ConfigService;
-import cn.hnthyy.thmz.service.thmz.HolidaysService;
-import cn.hnthyy.thmz.service.thmz.MessageService;
-import cn.hnthyy.thmz.service.thmz.OrderStatusChangeService;
+import cn.hnthyy.thmz.service.thmz.*;
 import cn.hnthyy.thmz.vo.ThmzmxsrParamsVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
@@ -63,6 +61,10 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
     @SuppressWarnings("all")
     @Autowired
     private MzZdWorkTimeMapper mzZdWorkTimeMapper;
+    @SuppressWarnings("all")
+    @Autowired
+    private CovidPojoMapper covidPojoMapper;
+
     @Autowired
     private MzyRequestService mzyRequestService;
     @Autowired
@@ -83,6 +85,12 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
     private OrderStatusChangeService orderStatusChangeService;
     @Autowired
     private HolidaysService holidaysService;
+    @Autowired
+    private HaiCiAdapterService haiCiAdapterService;
+    //无需新冠调查的科室
+    private List notCovid=Arrays.asList("1040200","1040000","1040100","1070000","1260000");
+    @Value("${lxbdcwjUrl}")
+    private String lxbdcwjUrl;
 
     //驾驶员id集合
     private List<String> patientIds = Arrays.asList(new String[]{"422429-4", "400758-4", "399163-4", "400429-4", "377323-4", "309261-4", "134402-4", "209695-4"});
@@ -97,6 +105,23 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         if (mzPatientMi == null) {
             throw new MzException("当前挂号的病人信息不存在，请先保存病人信息！");
         }
+        MzyRequest mzyRequest = mzyRequestMapper.selectMzyRequestById(mzyReqrecPageDto.getMzyRequestId());
+        //除了儿科与急诊科外都需要做新冠调查
+        if(!notCovid.contains(mzyRequest.getUnitCode())){
+            CovidPojo covidPojo = covidPojoMapper.selectLastCovidPojoByIdcard(mzPatientMi.getSocialNo(), mzPatientMi.getPatientId());
+            if (covidPojo == null) {
+                haiCiAdapterService.commonMessageNotice(mzPatientMi.getIcCardNo(),"{\"data\":{\"first\":{\"color\":\"#FF0000\",\"value\":\"很抱歉，您的暂时无法进行挂号，详情如下:\"},\"keyword1\":{\"color\":\"#173177\",\"value\":\"\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"挂号失败\"},\"keyword2\":{\"color\":\"#173177\",\"value\":\"\"},\"keyword3\":{\"color\":\"#173177\",\"value\":\"您还未做新型冠状病毒感染流行病学史问卷,请前往填写\"},\"remark\":{\"color\":\"#FF0000\",\"value\":\"\"}},\"miniprogram\":{\"appid\":\"\",\"pagepath\":\"\"},\"template_id\":\"PEDh0niCG93uQsY5P6XS-J3haoB8sn4Pq-ZSrEZ6gGo\",\"touser\":\"\",\"url\":\""+lxbdcwjUrl+mzyReqrec.getPatientId()+"\"}",new Date());
+                throw new MzException("当前挂号的病人还未做新型冠状病毒感染流行病学史问卷,请告知病人及时前往填写！");
+            }
+            boolean temperature =false;
+            if(covidPojo.getTemperature()==2){
+                BigDecimal feverNumber = new BigDecimal(covidPojo.getFeverNumber());
+                temperature= feverNumber.compareTo(BigDecimal.valueOf(37.3)) >= 0;
+            }
+            if (temperature|| covidPojo.getItem1() != 14 || covidPojo.getItem2() != 24 || covidPojo.getItem3() != 32 || covidPojo.getItem4() != 42 || covidPojo.getItem5() != 52) {
+                throw new MzException("当前病人新型冠状病毒感染流行病学史问卷未通过，请挂发热门诊并告知病人");
+            }
+        }
         Windows windows = windowsMapper.selectLastWindowsByUserIdCode(mzyReqrec.getOpId());
         if (windows == null) {
             throw new MzException("当前操作人未设置窗口号，请先设置！");
@@ -116,7 +141,6 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         }
         times++;
         int serialNo = mzSerialNoService.getMzSerialNo();
-        MzyRequest mzyRequest = mzyRequestMapper.selectMzyRequestById(mzyReqrecPageDto.getMzyRequestId());
         Date now = new Date();
         MzVisitTable newMzVisitTable = getMzVisitTable(mzyReqrecPageDto, mzyReqrec, mzPatientMi, windows, times, serialNo, now);
         mzVisitTableMapper.insertMzVisitTable(newMzVisitTable);

src/main/resources/application.yml

@@ -151,4 +151,9 @@ haiciServiceUrl: "https://api.med.gzhc365.com/openapi/health"
 #特殊门诊测试地址
 #tsmzServiceUrl: "http://172.16.30.27:8704/shengyb/mt"
 #特殊门诊生产地址
-tsmzServiceUrl: "http://172.16.32.163:8704/shengyb/mt"
+tsmzServiceUrl: "http://172.16.32.163:8704/shengyb/mt"
+
+#流行病调查问卷测试地址
+#lxbdcwjUrl: "http://192.168.3.10:8081/assessments/covid/"
+#流行病调查问卷生产地址
+lxbdcwjUrl: "http://staticweb.dj0217.top:8083/assessments/covid/"

src/main/resources/static/js/registration.js

@@ -171,9 +171,9 @@ $(function () {
      * 保存挂号信息
      */
     $("#saveConfirmFee").on("click", function (t) {
-        $("#saveConfirmFee").attr("disabled",true);
-        var cash=$("#cash").val();
-        if(cash==null || cash ==""){
+        $("#saveConfirmFee").attr("disabled", true);
+        var cash = $("#cash").val();
+        if (cash == null || cash == "") {
             new PNotify({
                 title: '错误提示',
                 text: "金额不能为空！",
@@ -181,13 +181,13 @@ $(function () {
                 hide: false,
                 styling: 'bootstrap3'
             });
-            $("#saveConfirmFee").attr("disabled",false);
+            $("#saveConfirmFee").attr("disabled", false);
             return;
         }
         var realMoney = parseFloat($("#realMoney").val());
         realMoney = realMoney.toFixed(2);
         if (parseFloat(cash) < realMoney) {
-            $("#saveConfirmFee").attr("disabled",false);
+            $("#saveConfirmFee").attr("disabled", false);
             return;
         }
         var patientId = $("#patientId").val();
@@ -325,7 +325,7 @@ $(function () {
     });
     $("#editUserIdCard").change(function (e) {
         var editUserIdCard = $("#editUserIdCard").val();
-        if(editUserIdCard==null || editUserIdCard==""){
+        if (editUserIdCard == null || editUserIdCard == "") {
             return;
         }
         var birthday = editUserIdCard.substring(6, 14);
@@ -352,7 +352,7 @@ $(function () {
     // setTimeout(function () {
     //     postCMD("login",localStorage.getItem("userID"),'000000','收费项目',0,0,0, '','祝您早日康复',0,0,0);
     // }, 600);
-    postCMD("login",localStorage.getItem("userID"),'000000','收费项目',0,0,0, '','祝您早日康复',0,0,0);
+    postCMD("login", localStorage.getItem("userID"), '000000', '收费项目', 0, 0, 0, '', '祝您早日康复', 0, 0, 0);
     setTimeout(function () {
         getLodop();
     }, 800);
@@ -481,10 +481,10 @@ function initEmployee() {
             var html = '';
             var defaultCode = null;
             $.each(res.data, function (commentIndex, comment) {
-               var employeeName =comment.employee.employeeName;
-               if(comment.leftNum!=null){
-                   employeeName=employeeName+"  余号("+comment.leftNum+")"
-               }
+                var employeeName = comment.employee.employeeName;
+                if (comment.leftNum != null) {
+                    employeeName = employeeName + "  余号(" + comment.leftNum + ")"
+                }
                 html += '<option value="' + comment.employee.employeeCode + '" data-chargeType="' + comment.chargeType + '"  data-checkFee="' + comment.checkFee + '" data-mzyRequestId="' + comment.mzyRequestId + '">' + employeeName + '</option>';
                 if (res.data.length == 1) {
                     //如果只有一个号别，默认选中
@@ -756,7 +756,7 @@ function confirmFeeModal() {
     $("#cash").val($("#amountMoneyConfirm").text());
     //$("#cash").val(null);
     $("#confirmFeeModal").modal();
-    sendPeiceMessage($("#amountMoneyConfirm").text(),0,0,'您本次应付金额为'+$("#amountMoneyConfirm").text()+'元',$("#patientId").val(),$("#userNameReadOnly").val());
+    sendPeiceMessage($("#amountMoneyConfirm").text(), 0, 0, '您本次应付金额为' + $("#amountMoneyConfirm").text() + '元', $("#patientId").val(), $("#userNameReadOnly").val());
 }
 
 /**
@@ -778,8 +778,8 @@ function formatCheck() {
  */
 function queryUserInfoByCardNo() {
     var cardNo = $("#cardNo").val();
-    var index =cardNo.indexOf("-");
-    if ((index > 0 && index==cardNo.length-2) || cardNo.length == 8) {
+    var index = cardNo.indexOf("-");
+    if ((index > 0 && index == cardNo.length - 2) || cardNo.length == 8) {
         $("#cardNo").attr("title", cardNo);
         $.ajax({
             type: "GET",
@@ -798,9 +798,9 @@ function queryUserInfoByCardNo() {
                         $("#userName").val(res.data.name);
                         $("#userName").blur();
                         $("#userNameReadOnly").val(res.data.name);
-                        var age =jsGetAge(res.data.birthDayStr);
-                        if(age==null){
-                            age=res.data.age;
+                        var age = jsGetAge(res.data.birthDayStr);
+                        if (age == null) {
+                            age = res.data.age;
                         }
                         $("#age").val(age);
                         $("#age").blur();
@@ -906,7 +906,7 @@ function checkFee() {
         if ($("#payType").val() == 1) {
             var changeAmount = cash - realMoney;
             $("#changeAmount").val(changeAmount.toFixed(2));
-            sendPeiceMessage(realMoney,cash,changeAmount.toFixed(2),'实际支付金额为'+cash+'元,应找零'+changeAmount+'元',$("#patientId").val(),$("#userNameReadOnly").val());
+            sendPeiceMessage(realMoney, cash, changeAmount.toFixed(2), '实际支付金额为' + cash + '元,应找零' + changeAmount + '元', $("#patientId").val(), $("#userNameReadOnly").val());
         } else {
             new PNotify({
                 title: '错误提示',
@@ -917,9 +917,9 @@ function checkFee() {
             });
             return;
         }
-    }else {
+    } else {
         $("#changeAmount").val(0.00);
-        sendPeiceMessage(realMoney,cash,0.00,'实际支付金额为'+cash+'元',$("#patientId").val(),$("#userNameReadOnly").val());
+        sendPeiceMessage(realMoney, cash, 0.00, '实际支付金额为' + cash + '元', $("#patientId").val(), $("#userNameReadOnly").val());
     }
     //计算和设置折扣比例
     var amountMoneyConfirm = parseFloat($("#amountMoneyConfirm").text());
@@ -1348,6 +1348,7 @@ function savePatient(flag) {
         url: '/thmz/savePatient',
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
+        async: false,
         data: JSON.stringify({
             "name": $("#userName").val(),
             "age": $("#age").val(),
@@ -1374,7 +1375,7 @@ function savePatient(flag) {
                     successMesage(res);
                 }
             } else {
-                $("#saveConfirmFee").attr("disabled",false);
+                $("#saveConfirmFee").attr("disabled", false);
                 errorMesage(res);
             }
         }
@@ -1382,6 +1383,9 @@ function savePatient(flag) {
 }
 
 
+
+
+
 // /**
 //  * 修改病人信息诊疗卡信息
 //  */
@@ -1500,7 +1504,7 @@ function saveMzyReqrec() {
                 // loadTableCount();
                 // loadRegistrationList(true);
                 clearRegistration();
-                postCMD("appraise",localStorage.getItem("userID"),'000000','收费项目',0,0,0, '','祝您早日康复',0,0,0);
+                postCMD("appraise", localStorage.getItem("userID"), '000000', '收费项目', 0, 0, 0, '', '祝您早日康复', 0, 0, 0);
             } else {
                 new PNotify({
                     title: '错误提示',
@@ -1510,7 +1514,7 @@ function saveMzyReqrec() {
                     styling: 'bootstrap3'
                 });
             }
-            $("#saveConfirmFee").attr("disabled",false);
+            $("#saveConfirmFee").attr("disabled", false);
         }
     });
 }
@@ -1674,7 +1678,7 @@ function clearRegistration() {
  */
 function prn1Print(patientId, times) {
     setPrint();
-    var height ="93.15mm";
+    var height = "93.15mm";
     // if(countReceiot%2==0){
     //     height ="93.2mm";
     // }
@@ -1693,7 +1697,7 @@ function prn1Print(patientId, times) {
                 if (res.data == null || res.data.length == 0) {
                     return;
                 }
-             //   countReceiot++;
+                //   countReceiot++;
                 LODOP = getLodop();
                 var temp = res.data;
                 LODOP.PRINT_INITA(6, 0, "120mm", height, "泰和门诊发票打印");
@@ -1711,7 +1715,7 @@ function prn1Print(patientId, times) {
                 LODOP.ADD_PRINT_TEXT("25mm", "7mm", "50mm", "3mm", temp.name);
                 LODOP.ADD_PRINT_TEXT("25mm", "61mm", "27mm", "3mm", patientId);
                 LODOP.ADD_PRINT_TEXT("32mm", "6mm", "50mm", "3mm", "就诊科室:" + temp.unitCode);
-                LODOP.ADD_PRINT_TEXT("32mm", "56mm", "50mm", "3mm", "地点:" + res.officePos==null?"":res.officePos);
+                LODOP.ADD_PRINT_TEXT("32mm", "56mm", "50mm", "3mm", "地点:" + res.officePos == null ? "" : res.officePos);
                 LODOP.ADD_PRINT_TEXT("37mm", "6mm", "50mm", "3mm", "看诊医生:" + temp.doctorCode);
                 LODOP.ADD_PRINT_TEXT("37mm", "56mm", "50mm", "3mm", "号段:" + temp.ampm);
                 LODOP.ADD_PRINT_TEXT("42mm", "6mm", "50mm", "3mm", "号别:" + temp.chargeType);
@@ -1730,7 +1734,7 @@ function prn1Print(patientId, times) {
                 if (times > 0) {
                     loadRegistrationList(true);
                 }
-            }else if(res.code == -2){
+            } else if (res.code == -2) {
                 new PNotify({
                     title: '操作提示',
                     text: res.message,
@@ -1738,7 +1742,7 @@ function prn1Print(patientId, times) {
                     hide: true,
                     styling: 'bootstrap3'
                 });
-            }else if (res.code == -1) {
+            } else if (res.code == -1) {
                 new PNotify({
                     title: '错误提示',
                     text: res.message,