新医保，结算时入库

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

@@ -0,0 +1,14 @@
+package thyyxxk.webserver.dao.his.medicalinsurance;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import thyyxxk.webserver.entity.medicalinsurance.SiSetldetail;
+
+/**
+ * @description: 医保结算基金分项信息
+ * @author: DingJie
+ * @create: 2021/7/1317:27
+ */
+@Mapper
+public interface SiSetldetailDao extends BaseMapper<SiSetldetail> {
+}

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

@@ -0,0 +1,14 @@
+package thyyxxk.webserver.dao.his.medicalinsurance;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import thyyxxk.webserver.entity.medicalinsurance.SiSetlinfo;
+
+/**
+ * @description: 结算基本信息
+ * @author: DingJie
+ * @create: 2021/7/1317:20
+ */
+@Mapper
+public interface SiSetlinfoDao extends BaseMapper<SiSetlinfo> {
+}

src/main/java/thyyxxk/webserver/entity/medicalinsurance/SiSetldetail.java

@@ -1,9 +1,12 @@
 package thyyxxk.webserver.entity.medicalinsurance;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
+@TableName(value = "t_si_setldetail")
 public class SiSetldetail implements Serializable {
 
 	private static final long serialVersionUID =  1691016964788042310L;

src/main/java/thyyxxk/webserver/entity/medicalinsurance/SiSetlinfo.java

@@ -1,10 +1,16 @@
 package thyyxxk.webserver.entity.medicalinsurance;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 @Data
+@TableName(value = "t_si_setlinfo")
 public class SiSetlinfo implements Serializable {
 
 	private static final long serialVersionUID =  6876991080910479303L;
@@ -67,6 +73,8 @@ public class SiSetlinfo implements Serializable {
 	/**
 	 * 出生日期
 	 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date brdy;
 
 	/**

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

@@ -11,6 +11,8 @@ import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.constants.SiFunction;
 import thyyxxk.webserver.constants.sidicts.MdtrtCertType;
+import thyyxxk.webserver.dao.his.medicalinsurance.SiSetldetailDao;
+import thyyxxk.webserver.dao.his.medicalinsurance.SiSetlinfoDao;
 import thyyxxk.webserver.dao.his.medicalinsurance.SiZyDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.medicalinsurance.*;
@@ -47,13 +49,18 @@ public class SiZyService {
     private static final String ERROR_MESSAGE = "err_msg";
     private static final String OUTPUT = "output";
     private final SiZyDao dao;
+    private final SiSetlinfoDao setlinfoDao;
+    private final SiSetldetailDao setldetailDao;
     private final ExecService exec;
     private final SettleService settleService;
     private final DismissService dismissService;
 
     @Autowired
-    public SiZyService(SiZyDao dao, ExecService exec, SettleService settleService, DismissService dismissService) {
+    public SiZyService(SiZyDao dao, SiSetlinfoDao setlinfoDao, SiSetldetailDao setldetailDao, ExecService exec,
+                       SettleService settleService, DismissService dismissService) {
         this.dao = dao;
+        this.setlinfoDao = setlinfoDao;
+        this.setldetailDao = setldetailDao;
         this.exec = exec;
         this.settleService = settleService;
         this.dismissService = dismissService;
@@ -354,10 +361,23 @@ public class SiZyService {
         }
         if (result.getIntValue(RESULT_CODE) == 0) {
             JSONObject setlinfo = result.getJSONObject(OUTPUT).getJSONObject("setlinfo");
-            String setlId = setlinfo.getString("setl_id");
-            String medinsSetlId = setlinfo.getString("medins_setl_id");
-            dao.updateSiZyInfoSetlId(p.getInpatientNo(), p.getAdmissTimes(), p.getLedgerSn(), setlId, medinsSetlId);
-            // todo 结算
+            SiSetlinfo setlEntity = JSONObject.parseObject(setlinfo.toJSONString(), SiSetlinfo.class);
+            setlEntity.setInpatientNo(p.getInpatientNo());
+            setlEntity.setAdmissTimes(p.getAdmissTimes());
+            setlEntity.setLedgerSn(p.getLedgerSn());
+            setlinfoDao.insert(setlEntity);
+            dao.updateSiZyInfoSetlId(p.getInpatientNo(), p.getAdmissTimes(), p.getLedgerSn(),
+                    setlEntity.getSetlId(), setlEntity.getMedinsSetlId());
+            JSONArray setldetail = result.getJSONObject(OUTPUT).getJSONArray("setldetail");
+            for (int i = 0; i < setldetail.size(); i++) {
+                SiSetldetail setldetailEntity = JSONObject.parseObject(setldetail.getJSONObject(i).toJSONString(), SiSetldetail.class);
+                setldetailEntity.setInpatientNo(p.getInpatientNo());
+                setldetailEntity.setAdmissTimes(p.getAdmissTimes());
+                setldetailEntity.setLedgerSn(p.getLedgerSn());
+                setldetailDao.insert(setldetailEntity);
+            }
+
+            // todo 结算，需要改造
             YbSettleFee settleFee = new YbSettleFee();
             if (p.getDismissFlag() == 2) {
                 settleFee.setZjdzDatetime(p.getMidSetlDate());