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

src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/CaseFrontSheetDao.java

@@ -477,11 +477,11 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
             "#{dismissStatus}, #{opIdCode})")
     void writeNewDisdiag(CaseFrontsheetDisdiag disDiag);
 
-    @Insert("insert into batj_ba4 (bah, zyh, zycs, ssxh, ssmc, ssrq, ssjb,ssbm," +
-            "ssys, sszs1, sszs2, qkjb, yhqk, mzff, mzys) " +
-            "values (#{bah}, #{bah}, #{times}, #{no}, #{name}, #{date}, #{level}," +
-            " #{code}, #{operator}, #{assistantOne}, #{assistantTwo}, #{cut}, #{heal}, " +
-            "#{anaesthesia}, #{anaesthesiaor})")
+    @Insert("insert into batj_ba4 (bah,zyh,zycs,ssxh,ssmc,ssrq,ssjb,ssbm,ssys,sszs1,sszs2,qkjb,yhqk," +
+            "mzff,mzys,op_start_date,op_end_date,anst_start_date,anst_end_date) " +
+            "values (#{bah},#{bah},#{times},#{no},#{name},#{date},#{level},#{code},#{operator},#{assistantOne}," +
+            "#{assistantTwo},#{cut},#{heal},#{anaesthesia},#{anaesthesiaor},#{date},#{opEndDate}," +
+            "#{anstStartDate},#{anstEndDate})")
     void writeNewZySurgeryRecord(CaseFrontsheetSurgery surgery);
 
     @Select("select status from t_frontsheet_sign_apply where bah=#{bah} and times=#{times} ")

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

@@ -3,7 +3,6 @@ package thyyxxk.webserver.entity.casefrontsheet;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import thyyxxk.webserver.utils.StringUtil;
@@ -109,6 +108,15 @@ public class CaseFrontsheetSurgery implements Serializable {
 	 */
 	private String anaesthesiaorName;
 
+	@TableField(exist = false)
+	private Date opEndDate;
+
+	@TableField(exist = false)
+	private Date anstStartDate;
+
+	@TableField(exist = false)
+	private Date anstEndDate;
+
 	/**
 	 * 切口愈合等级  切口：Ⅰ,Ⅱ,Ⅲ；愈合：甲，乙，丙
 	 * */

src/main/java/thyyxxk/webserver/service/casefrontsheet/VerifyCaseFrontSheet.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.service.casefrontsheet;
 
 import lombok.extern.slf4j.Slf4j;
 import thyyxxk.webserver.constants.Capacity;
+import thyyxxk.webserver.constants.sidicts.Insutype;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetDisdiag;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetMain;
 import thyyxxk.webserver.entity.casefrontsheet.CaseFrontsheetSurgery;
@@ -122,12 +123,14 @@ public class VerifyCaseFrontSheet {
         if (StringUtil.invalidValue(info.getHkPlaceName())) {
             array.add(new PureCodeName("hkPlaceName","患者户口地址不能为空！"));
         }
-//        if (StringUtil.isBlank(info.getUnitName()) || StringUtil.isBlank(info.getUnitPlace())) {
-//            array.add(new PureCodeName("unitName","患者工作单位及地址不能为空！"));
-//        }
-//        if (StringUtil.isBlank(info.getUnitPhone())) {
-//            array.add(new PureCodeName("unitPhone","患者单位电话不能为空！"));
-//        }
+        if (info.getInsutype().equals(Insutype.BASIC_MEDICAL_INSURANCE_FOR_EMPLOYEES.getCode())) {
+            if (StringUtil.isBlank(info.getUnitName()) || StringUtil.isBlank(info.getUnitPlace())) {
+                array.add(new PureCodeName("unitName","患者工作单位及地址不能为空！"));
+            }
+            if (StringUtil.isBlank(info.getUnitPhone())) {
+                array.add(new PureCodeName("unitPhone","患者单位电话不能为空！"));
+            }
+        }
         if (StringUtil.invalidValue(info.getContactName())) {
             array.add(new PureCodeName("contactName","患者联系人姓名不能为空！"));
         }