添加医保编码，以及结算单上传中 nwb_age 不能为 -

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

@@ -98,7 +98,7 @@ public interface UpIdCollectionDao {
             "           when datediff(day, a.admiss_date, dismiss_date) <= 0 then 1 " +
             "           else datediff(day, a.admiss_date, dismiss_date) end                            as act_ipt_days,/*实际住院天数*/ " +
             "       zy_serial_no                                                                       as biz_sn /*业务流水号*/, " +
-            "       age_days                                                                           as nwb_age/*新生儿年龄*/, " +
+            "       case age_days when '-' then 0 else age_days end                                    as nwb_age/*新生儿年龄*/, " +
             "       contact_addr_name                                                                  as coner_addr /*联系人地址*/, " +
             "       case new_born_weight when '-' then 0 else age_days end                             as nwb_bir_wt/*新生儿体重*/, " +
             "       case new_born_admiss_weight when '-' then 0 else age_days end                      as nwb_adm_wt/*新生儿入院体重*/ " +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
-import thyyxxk.webserver.entity.yibao.ZyActpatient;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.*;
 
 import java.math.BigDecimal;
@@ -23,19 +22,6 @@ import java.util.Set;
 @Mapper
 public interface YiZhuLuRuDao {
 
-    @Select("SELECT rtrim(a.inpatient_no) inpatient_no, " +
-            "       rtrim(a.name) name, " +
-            "       a.sex, " +
-            "       rtrim(a.bed_no) bed_no, " +
-            "       isnull(rtrim(a.consult_physician),'')  consult_physician, " +
-            "       a.refer_physician, " +
-            "       zk_ward," +
-            "       zk_ward_name= (select rtrim(name) from zd_unit_code where code = zk_ward)" +
-            "FROM zy_actpatient a with (NOLOCK) " +
-            "WHERE (a.dept = #{wardCode}) " +
-            "  AND (a.ward = #{wardCode})")
-    List<ZyActpatient> huoQuHuanZheLieBiao(String wardCode);
-
     @Select("select isnull(balance,0) balance, " +
             "       total_charge, " +
             "       charge1, " +
@@ -230,7 +216,8 @@ public interface YiZhuLuRuDao {
             "                yb_flag_new," +
             "                father_flag, " +
             "                manu_name=(select name from yp_zd_manufactory with (NOLOCK) where code *= a.manu_code), " +
-            "                stock_amount=a.stock_amount " +
+            "                stock_amount=a.stock_amount, " +
+            "                national_code " +
             "FROM view_yp_zd_dict_base_yf a with (NOLOCK) " +
             "WHERE isnull(a.visible_flag_zy, '') <> '1' " +
             "  and (a.py_code like #{code} or a.name like #{code} or code like #{code}) " +

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/YiZhuMingChen.java

@@ -41,6 +41,10 @@ public class YiZhuMingChen {
     private String ybType;
     private String fatherFlag;
     private String manuName;
+    /**
+     * 医保编码
+     */
+    private String nationalCode;
 
     //---------------------------------草药医嘱要用的
     /**