Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/controller/technologyArchives/HLTechnologyArchivesController.java

@@ -144,8 +144,8 @@ public class HLTechnologyArchivesController {
 
     //上传图片
     @PostMapping("/putHL4CertificateImage")
-    public ResultVo<Map<String, Object>> putHL4CertificateImage(@RequestBody MultipartFile file) {
-        return hlservice.putHL4CertificateImage(file);
+    public ResultVo<Map<String, Object>> putHL4CertificateImage(@RequestBody MultipartFile file,@RequestParam("name") String name) {
+        return hlservice.putHL4CertificateImage(file,name);
     }
     @GetMapping("/setHL4Image")
     public ResultVo<Map<String, Object>> setHL4Image(@RequestParam("socialNo") String socialNo, @RequestParam("beginTime") String beginTime, String url) {

src/main/java/thyyxxk/webserver/dao/his/inpatient/casefrontsheet/BasSelectOverviewDao.java

@@ -133,4 +133,8 @@ public interface BasSelectOverviewDao extends BaseMapper<CaseFrontsheetSurgery>
             "from ba_op_log where inpatient_no=#{bah} and admiss_times=#{times} " +
             "order by op_time desc")
     List<BaOpLog> getBaOpLogs(String bah, Integer times);
+
+    @Select("select major_error from t_frontsheet_quality_verification " +
+            "where pat_no=#{bah} and times=#{times} and major_error is not null")
+    List<String> getMajorErrors(String bah, Integer times);
 }

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiSettleApplyDao.java

@@ -37,9 +37,13 @@ public interface SiSettleApplyDao {
                                     @Param("ledger") int ledger,
                                     @Param("type") int type);
 
-    @Insert("insert into t_si_settle_apply (pat_no,times,ledger_sn,input_staff,input_comment,input_datetime,status,type," +
-            "settle_datetime,settled,acct_used_flag,death_flag,sort_no) values (#{patNo},#{times},#{ledgerSn},#{inputStaff}," +
-            "#{inputComment},getdate(),0,#{type},#{settleDatetime},0,#{acctUsedFlag},#{deathFlag},#{sortNo})")
+    @Insert("insert into t_si_settle_apply " +
+            "(pat_no,times,ledger_sn,input_staff,input_comment,input_datetime,status,type," +
+            "settle_datetime,settled,acct_used_flag,death_flag,sort_no,handle_staff," +
+            "handle_comment,handle_datetime) values " +
+            "(#{patNo},#{times},#{ledgerSn},#{inputStaff},#{inputComment},getdate()," +
+            "#{status},#{type},#{settleDatetime},0,#{acctUsedFlag},#{deathFlag},#{sortNo}," +
+            "#{handleStaff},#{handleComment},#{handleDatetime})")
     void insertSettleApply(SiSettleApply apply);
 
     @Select("select a.*,c.sex as gender,rtrim(c.name) as name,b.med_type, " +

src/main/java/thyyxxk/webserver/entity/casefrontsheet/CaseFrontsheetMain.java

@@ -806,6 +806,11 @@ public class CaseFrontsheetMain implements Serializable {
      * */
     private Integer mainDisdiagStatus;
 
+    private Integer maindiagInputErr;
+    private Integer maindiagCodeErr;
+    private Integer mainsurgInputErr;
+    private Integer mainsurgCodeErr;
+
     /**
      * 诊断列表
      */

src/main/java/thyyxxk/webserver/service/LoginService.java

@@ -82,7 +82,8 @@ public class LoginService {
 
         String token = TokenUtil.getInstance().createToken(tempUserInfo.getCode());
         try {
-            JSONObject json = srvc.getUserinfo(tokenService.getWeComAddressBookToken(), tempUserInfo.getCodeRs());
+            String qxwxToken = tokenService.getWeComAddressBookToken();
+            JSONObject json = srvc.getUserinfo(qxwxToken, tempUserInfo.getCodeRs());
             tempUserInfo.setAvatar(json.getString("avatar"));
         } catch (Exception ignored) {
         }

src/main/java/thyyxxk/webserver/service/externalhttp/WebSocketService.java

@@ -8,7 +8,7 @@ import thyyxxk.webserver.entity.socketmessage.SendUserList;
 
 import java.util.List;
 
-@BaseRequest(baseURL = "${socketCenter}")
+@BaseRequest(baseURL = "${socketCenter}", connectTimeout = 1000, readTimeout = 1000)
 public interface WebSocketService {
     @Post("/sendMessageBySid")
     ResultVo<String> sendMessageBySid(@JSONBody ApiMessageBody body);

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -761,6 +761,7 @@ public class CaseFrontSheetMainService {
             if (null == sheet.getLateFlag()) {
                 sheet.setLateFlag(calculateLateState(sheet.getDismissDate()));
             }
+            fillMajorErrorFlags(sheet);
             insertSheetData(sheet);
             basDao.updateActFileStatus(bah, times, State.FileStatus.SIGNED);
             dao.writeBaOpLog(2, staffId, bah, times);
@@ -769,6 +770,27 @@ public class CaseFrontSheetMainService {
         return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请勿重复签收。");
     }
 
+    private void fillMajorErrorFlags(CaseFrontsheetMain sheet) {
+        List<String> majorErrors = basDao.getMajorErrors(sheet.getBah(), sheet.getAdmissTimes());
+        if (majorErrors.isEmpty()) {
+            return;
+        }
+        for (String majorError : majorErrors) {
+            if (majorError.contains("主要诊断填写错误")) {
+                sheet.setMaindiagInputErr(1);
+            }
+            if (majorError.contains("主要诊断编码错误")) {
+                sheet.setMaindiagCodeErr(1);
+            }
+            if (majorError.contains("主要手术填写错误")) {
+                sheet.setMainsurgInputErr(1);
+            }
+            if (majorError.contains("主要手术编码错误")) {
+                sheet.setMainsurgCodeErr(1);
+            }
+        }
+    }
+
     public void insertSheetData(CaseFrontsheetMain sheet) {
         if (null == sheet.getSignStaff()) {
             sheet.setSignStaff(dao.selectSignStaff(sheet.getBah(), sheet.getAdmissTimes()));

src/main/java/thyyxxk/webserver/service/medicalinsurance/SiSettleApplyService.java

@@ -131,8 +131,8 @@ public class SiSettleApplyService {
         LocalTime amEnd = LocalTime.of(12, 0);
         LocalTime pmStart = LocalTime.of(14, 0);
         LocalTime pmEnd = LocalTime.of(17, 30);
-        return (!currentTime.isBefore(amStart) && !currentTime.isAfter(amEnd)) ||
-                        (!currentTime.isBefore(pmStart) && !currentTime.isAfter(pmEnd));
+        return (currentTime.isAfter(amStart) && currentTime.isBefore(amEnd)) ||
+                        (currentTime.isAfter(pmStart) && currentTime.isBefore(pmEnd));
     }
 
     public ResultVo<List<SiSettleApply>> selectUnhandledApplies() {

src/main/java/thyyxxk/webserver/service/technologyArchives/HLTechnologyArchivesService.java

@@ -526,10 +526,10 @@ public class HLTechnologyArchivesService {
         return ResultVoUtil.success(map);
     }
 
-    public ResultVo<Map<String, Object>> putHL4CertificateImage(MultipartFile file) {
+    public ResultVo<Map<String, Object>> putHL4CertificateImage(MultipartFile file,String name) {
         UserInfo user = redisLikeService.getUserInfoByToken();
         String code = user.getCodeRs();
-        String uploadDir = "/uploadimage/hltechnology/trainingcertificateImage/" + code;
+        String uploadDir = "/uploadimage/hltechnology/trainingcertificateImage/" + code + "/" + name;
         Map<String, Object> map = new HashMap<>();
         map.put("data",archiveServer.uploadFile(file,uploadDir,!isProd));
         return ResultVoUtil.success(map);