修改日期字段以及一个bug

src/main/java/thyyxxk/webserver/dao/his/surgicalmanagement/SurgeryArrangementDao.java

@@ -20,10 +20,10 @@ public interface SurgeryArrangementDao {
     List<GetDropdownBox> getASurgicalWard();
 
     @Select("SELECT record_id=a.record_id," +
-            "       op_startdate, " +
-            "       op_enddate, " +
-            "       anst_startdate," +
-            "       anst_enddate, " +
+            "       op_start_date, " +
+            "       op_end_date, " +
+            "       anst_start_date," +
+            "       anst_end_date, " +
             "       req_date = a.req_date, " +
             "       zy_serial_no=a.zy_serial_no, " +
             "       op_times=a.op_times, " +
@@ -127,10 +127,10 @@ public interface SurgeryArrangementDao {
 
 
     @Update("update op_record " +
-            "set op_startdate   = #{opStartDate}, " +
-            "    op_enddate     = #{opEndDate}, " +
-            "    anst_startdate = #{anstStartDate}, " +
-            "    anst_enddate   = #{anstEndDate} " +
+            "set op_start_date   = #{opStartDate}, " +
+            "    op_end_date     = #{opEndDate}, " +
+            "    anst_start_date = #{anstStartDate}, " +
+            "    anst_end_date   = #{anstEndDate} " +
             "where record_id = #{recordId} " +
             "  and inpatient_no = #{inpatientNo}")
     void modifySurgeryTime(OpRecord pojo);

src/main/java/thyyxxk/webserver/entity/medicalinsurance/inpatient/BatjBa4.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.entity.medicalinsurance.inpatient;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -114,6 +115,31 @@ public class BatjBa4 implements Serializable {
     private String operDrCode;
     private String anstDrCode;
 
+    //////////////// 以下是 4101A 新增数据 ///////////////////////////
+    /**
+     * 手术操作开始时间
+     */
+    @JSONField(name = "oprn_oprt_begntime")
+    private String oprnOprtBegntime;
+
+    /**
+     * 手术操作结束时间
+     */
+    @JSONField(name = "oprn_oprt_endtime")
+    private String oprnOprtEndtime;
+
+    /**
+     * 麻醉开始时间
+     */
+    @JSONField(name = "anst_begntime")
+    private String anstBegntime;
+
+    /**
+     * 麻醉结束时间
+     */
+    @JSONField(name = "anst_endtime")
+    private String anstEndtime;
+
     /**
      * 手术开始时间
      */

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllistupld/SetlinfoUpld.java

@@ -534,6 +534,7 @@ public class SetlinfoUpld implements Serializable {
      */
     @JSONField(name = "resp_nurs_code")
     private String respNursCode;
+    private String respNursName;
 
     /**
      * 状态分类

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllistupldTemp/SetlinfoUpldTemp.java

@@ -539,15 +539,6 @@ public class SetlinfoUpldTemp {
      */
     @JSONField(name = "medins_fill_psn")
     private String medinsFillPsn;
-
-
-    // 打印结算单需要的字段
-    /**
-     * 责任护士
-     */
-    private String respNurs;
-    private String respNursName;
-
     //////////////////////////// 以下是4101A 新增入参 /////////////////////////////////////
     /**
      * 人员编号
@@ -560,6 +551,7 @@ public class SetlinfoUpldTemp {
      */
     @JSONField(name = "resp_nurs_code")
     private String respNursCode;
+    private String respNursName;
 
     /**
      * 状态分类

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

@@ -386,12 +386,6 @@ public class SetlListUpldService {
         temp.getSetlinfo().setRefldeptDeptName(dao.getYbDeptName(temp.getSetlinfo().getRefldeptDept()));
         // 出院科别
         temp.getSetlinfo().setDscgCatyName(dao.getYbDeptName(temp.getSetlinfo().getDscgCaty()));
-        // 责任护士
-        GetDropdownBox zeRenHuShi = dao.zeRenHuShi(patNo, times);
-        if (zeRenHuShi != null) {
-            temp.getSetlinfo().setRespNurs(zeRenHuShi.getCode());
-            temp.getSetlinfo().setRespNursName(zeRenHuShi.getName());
-        }
         return ResultVoUtil.success(temp);
     }
 
@@ -969,10 +963,8 @@ public class SetlListUpldService {
         }
         // 收费信息
         upldCollection.setIteminfo(EntityCopy.CopyList(listResultVo.getData(), IteminfoUpld.class));
-        log.info("收费信息：{}", JSON.toJSONString(listResultVo.getData()));
         //基金支付类型
         upldCollection.setPayinfo(dao.payinfoUpld(patNo, times, ledgerSn));
-//        log.info("基金支付类型：{}", upldCollection.getPayinfo());
         return ResultVoUtil.success(upldCollection);
     }
 

src/main/resources/application.yml

@@ -73,7 +73,7 @@ si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
 
 execute-scheduled: false
 
-#logging:
-#  level:
-#    thyyxxk.webserver.dao: debug
+logging:
+  level:
+    thyyxxk.webserver.dao: debug
 

src/main/test/thyyxxk/webserver/WebServerApplicationTest.java

@@ -14,10 +14,10 @@ import thyyxxk.webserver.service.test.TestServer;
 public class WebServerApplicationTest {
 
     @Autowired
-    private TestServer 服务;
+    private TestServer server;
 
     @Test
     public void test() {
-        服务.更新过敏源的拼音和五笔();
+        server.更新过敏源的拼音和五笔();
     }
 }