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

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

@@ -108,7 +108,6 @@ public interface JieShouHuiZhenDao {
             "        1, #{execUnit})")
     void insertYzZyPatientFee(YzZyPatientFee fee);
 
-
     @Select("select count(1)\n" +
             "from zy_detail_charge\n" +
             "where inpatient_no = #{patNo}\n" +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/emr/EmrPatientDao.java

@@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import thyyxxk.webserver.entity.datamodify.YzTemperature;
 import thyyxxk.webserver.entity.fluorescenceTest.FluorescenceSpecimenResult;
-import thyyxxk.webserver.entity.inpatient.patient.Patient;
 import thyyxxk.webserver.entity.medicalinsurance.inpatient.ZyPatientInfo;
 import thyyxxk.webserver.entity.outpatient.thmz.MzEmrPatientData;
 import thyyxxk.webserver.entity.zhuyuanyisheng.ZyZkList;
@@ -229,20 +228,6 @@ public interface EmrPatientDao extends BaseMapper<EmrPatientData> {
             "</script>")
     List<EmrPatientData> selectEmrDeteles(String patNo, Integer times, String createId);
 
-    @Update("update emr_rule_unlock " +
-            "set emr_id = #{emrDocumentId} " +
-            "where pat_no = #{patNo} " +
-            "  and times = #{times} " +
-            "  and code = #{emrCategoryCode} " +
-            "  and flag = 1 " +
-            "  and date = (select max(date) " +
-            "from emr_rule_unlock where pat_no = #{patNo} " +
-            " and times = #{times} and code = #{emrCategoryCode} and flag = 1) " +
-            " and input_id = #{createId}" +
-            " and emr_id is null")
-    void unlockMedicalRecords(EmrPatientData param);
-
-
     @Select("select id, " +
             "       pat_no, " +
             "       times, " +
@@ -551,19 +536,11 @@ public interface EmrPatientDao extends BaseMapper<EmrPatientData> {
             "where pat_no = #{mzNo} ")
     List<MzEmrPatientData> getEmrPatientMz(String mzNo);
 
-    @Select("select rtrim(b.name) as name, b.sex, b.social_no\n" +
-            "from emr_patient_data a,\n" +
-            "     a_patient_mi b\n" +
-            "where emr_document_id = #{documentId}\n" +
-            "  and a.pat_no = b.inpatient_no")
-    Patient getPatientInfoByDocumentId(String documentId);
-
     @Delete("delete emr_patient_data\n" +
             "where emr_document_id = #{id}\n" +
             "  and create_id = #{code}  and emr_category_code = 'This is Dir'")
     int delDir(String id, String code);
 
-
     @Update("update emr_patient_data\n" +
             "set emr_name = #{name},\n" +
             "    name     = #{name}\n" +

src/main/java/thyyxxk/webserver/utils/TryUtil.java

@@ -1,13 +1,13 @@
 package thyyxxk.webserver.utils;
 
 
-import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Supplier;
 
-@Slf4j
 public class TryUtil {
 
     @FunctionalInterface
@@ -21,7 +21,8 @@ public class TryUtil {
 
     private final List<Supplier<Object>> predicates = new LinkedList<>();
 
-    public static TryUtil create() {
+    @Contract(" -> new")
+    public static @NotNull TryUtil create() {
         return new TryUtil();
     }