药品账页优化

src/main/java/cn/hnthyy/thmz/entity/his/yp/YpZdDict.java

@@ -277,4 +277,6 @@ public class YpZdDict {
     private Integer isCentralPurchase;
     //药品采购编码
     private String purchaseCode;
+    //药管平台码
+    private String drugControlCode;
 }

src/main/java/cn/hnthyy/thmz/entity/his/zy/ZyZdAuditItem.java

@@ -3,7 +3,7 @@ package cn.hnthyy.thmz.entity.his.zy;
 import lombok.Data;
 
 /**
- * 住院字典
+ * 住院字典 核算码
  */
 @Data
 public class ZyZdAuditItem {

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpZdDictMapper.java

@@ -21,14 +21,14 @@ public interface YpZdDictMapper {
             "       country_flag, fix_price, new_flag, manu_code, yb_flag, sort_code, gmp_flag, cold_flag, chem_remark, drug_kind," +
             "       zb_flag, zb_supplyer, n_code as yn_code, bill_item_mz, bill_item_zy, supply_type, rtrim(frequency)frequency, ps_flag, ex_code, kss_flag," +
             "       zj_flag, spec_b, yb_code, yb_type, yb_code_zf, init_flag, yp_level, drug_id, serial_old, spec_pack, xnh_flag," +
-            "       buy_price, self_flag_yb, order_dosage, dosage_unit, yb_comment, isnull(rtrim(jb_flag),0) jb_flag, location, zs_flag, audit_code, comment," +
+            "       buy_price, self_flag_yb, order_dosage, dosage_unit, yb_comment, isnull(rtrim(jb_flag),0) jb_flag, location, zs_flag, rtrim(audit_code)audit_code, comment," +
             "       categories_flag, father_flag, ybxj_price, ym_flag, dpym_flag, yb_comment2, yb_code2, kjyw_flag, ygyyjc_type," +
             "       ddd_value, kj_limit_flag, yp_id, xtpp_name, sp_name, qj_flag, js_flag, rtrim(pzwh)pzwh, xnh_code, xnh_name, xnh_ratio," +
             "       xnh_quotamoney, xnh_status, xnh_bl, city_bl, syb_bl, cl_flag, avg_price, yb_flag_city, yb_flag_xnh, yb_code_city," +
             "       yb_code_xnh, yb_comment_city, yb_comment_xnh, ddd_unit, wg_type, fh_name, yb_flag_new, yb_comment_new, rtrim(yb_bl_new)yb_bl_new," +
             "       wjw_ypid, yjj_ypid, rsb_ypid, mz_restrict, isnull(byj_flag,0) byj_flag, national_code, national_name, national_status, match_oper," +
             "       match_date, cancel_match_oper, cancel_match_date, new_name, oper_id, oper_date, uploaded_flag, prescription_limit_days," +
-            "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code" +
+            "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code,drug_control_code" +
             " from yp_zd_dict WITH(NOLOCK) where code = #{code,jdbcType=VARCHAR} and serial = #{serial}")
     YpZdDict selectYpZdDictByCodeAndSerial(@Param("code") String code, @Param("serial") String serial);
 
@@ -45,14 +45,14 @@ public interface YpZdDictMapper {
                     "       country_flag, fix_price, new_flag, manu_code, yb_flag, sort_code, gmp_flag, cold_flag, chem_remark, drug_kind," +
                     "       zb_flag, zb_supplyer, n_code as yn_code, bill_item_mz, bill_item_zy, supply_type, rtrim(frequency)frequency, ps_flag, ex_code, kss_flag," +
                     "       zj_flag, spec_b, yb_code, yb_type, yb_code_zf, init_flag, yp_level, drug_id, serial_old, spec_pack, xnh_flag," +
-                    "       buy_price, self_flag_yb, order_dosage, dosage_unit, yb_comment, isnull(rtrim(jb_flag),0) jb_flag, location, zs_flag, audit_code, comment," +
+                    "       buy_price, self_flag_yb, order_dosage, dosage_unit, yb_comment, isnull(rtrim(jb_flag),0) jb_flag, location, zs_flag, rtrim(audit_code)audit_code, comment," +
                     "       categories_flag, father_flag, ybxj_price, ym_flag, dpym_flag, yb_comment2, yb_code2, kjyw_flag, ygyyjc_type," +
                     "       ddd_value, kj_limit_flag, yp_id, xtpp_name, sp_name, qj_flag, js_flag, rtrim(pzwh)pzwh, xnh_code, xnh_name, xnh_ratio," +
                     "       xnh_quotamoney, xnh_status, xnh_bl, city_bl, syb_bl, cl_flag, avg_price, yb_flag_city, yb_flag_xnh, yb_code_city," +
                     "       yb_code_xnh, yb_comment_city, yb_comment_xnh, ddd_unit, wg_type, fh_name, yb_flag_new, yb_comment_new, rtrim(yb_bl_new)yb_bl_new," +
                     "       wjw_ypid, yjj_ypid, rsb_ypid, mz_restrict, isnull(byj_flag,0) byj_flag, national_code, national_name, national_status, match_oper," +
                     "       match_date, cancel_match_oper, cancel_match_date, new_name, oper_id, oper_date, uploaded_flag, prescription_limit_days," +
-                    "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code" +
+                    "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code,drug_control_code" +
                     " from yp_zd_dict WITH(NOLOCK)",
             "<when test='codes!=null'>",
             " where code in",
@@ -76,14 +76,14 @@ public interface YpZdDictMapper {
             "       country_flag, fix_price, new_flag, manu_code, yb_flag, sort_code, gmp_flag, cold_flag, chem_remark, drug_kind," +
             "       zb_flag, zb_supplyer, n_code as yn_code, bill_item_mz, bill_item_zy, supply_type, rtrim(frequency)frequency, ps_flag, ex_code, kss_flag," +
             "       zj_flag, spec_b, yb_code, yb_type, yb_code_zf, init_flag, yp_level, drug_id, serial_old, spec_pack, xnh_flag," +
-            "       buy_price, self_flag_yb, order_dosage, dosage_unit, yb_comment, isnull(rtrim(jb_flag),0) jb_flag, location, zs_flag, audit_code, comment," +
+            "       buy_price, self_flag_yb, order_dosage, dosage_unit, yb_comment, isnull(rtrim(jb_flag),0) jb_flag, location, zs_flag, rtrim(audit_code)audit_code, comment," +
             "       categories_flag, father_flag, ybxj_price, ym_flag, dpym_flag, yb_comment2, yb_code2, kjyw_flag, ygyyjc_type," +
             "       ddd_value, kj_limit_flag, yp_id, xtpp_name, sp_name, qj_flag, js_flag, rtrim(pzwh)pzwh, xnh_code, xnh_name, xnh_ratio," +
             "       xnh_quotamoney, xnh_status, xnh_bl, city_bl, syb_bl, cl_flag, avg_price, yb_flag_city, yb_flag_xnh, yb_code_city," +
             "       yb_code_xnh, yb_comment_city, yb_comment_xnh, ddd_unit, wg_type, fh_name, yb_flag_new, yb_comment_new, rtrim(yb_bl_new)yb_bl_new," +
             "       wjw_ypid, yjj_ypid, rsb_ypid, mz_restrict, isnull(byj_flag,0) byj_flag, national_code, national_name, national_status, match_oper," +
             "       match_date, cancel_match_oper, cancel_match_date, new_name, oper_id, oper_date, uploaded_flag, prescription_limit_days," +
-            "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code" +
+            "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code,drug_control_code" +
             " from yp_zd_dict WITH(NOLOCK) where code = #{code,jdbcType=VARCHAR} ")
     List<YpZdDict> selectYpZdDictByCode(@Param("code") String code);
 
@@ -127,14 +127,14 @@ public interface YpZdDictMapper {
             "       country_flag, d.fix_price, d.new_flag, d.manu_code, d.yb_flag, d.sort_code, d.gmp_flag, d.cold_flag, d.chem_remark, d.drug_kind," +
             "       zb_flag, d.zb_supplyer, d.n_code as yn_code, d.bill_item_mz, d.bill_item_zy, d.supply_type, rtrim(d.frequency)frequency, d.ps_flag, d.ex_code, d.kss_flag," +
             "       zj_flag, d.spec_b, d.yb_code, d.yb_type, d.yb_code_zf, d.init_flag, d.yp_level, d.drug_id, d.serial_old, d.spec_pack, d.xnh_flag," +
-            "       buy_price, d.self_flag_yb, d.order_dosage, d.dosage_unit, d.yb_comment, isnull(rtrim(jb_flag),0) jb_flag, d.location, d.zs_flag, d.audit_code, d.comment," +
+            "       buy_price, d.self_flag_yb, d.order_dosage, d.dosage_unit, d.yb_comment, isnull(rtrim(jb_flag),0) jb_flag, d.location, d.zs_flag, rtrim(d.audit_code)audit_code, d.comment," +
             "       categories_flag, d.father_flag, d.ybxj_price, d.ym_flag, d.dpym_flag, d.yb_comment2, d.yb_code2, d.kjyw_flag, d.ygyyjc_type," +
             "       ddd_value, d.kj_limit_flag, d.yp_id, d.xtpp_name, d.sp_name, d.qj_flag, d.js_flag, rtrim(d.pzwh)pzwh, d.xnh_code, d.xnh_name, d.xnh_ratio," +
             "       xnh_quotamoney, d.xnh_status, d.xnh_bl, d.city_bl, d.syb_bl, d.cl_flag, d.avg_price, d.yb_flag_city, d.yb_flag_xnh, d.yb_code_city," +
             "       yb_code_xnh, d.yb_comment_city, d.yb_comment_xnh, d.ddd_unit, d.wg_type, d.fh_name, d.yb_flag_new, d.yb_comment_new, rtrim(d.yb_bl_new)yb_bl_new," +
             "       wjw_ypid, d.yjj_ypid, d.rsb_ypid, d.mz_restrict, isnull(byj_flag,0) byj_flag, d.national_code, d.national_name, d.national_status, d.match_oper," +
             "       match_date, d.cancel_match_oper, d.cancel_match_date, d.new_name, d.oper_id, d.oper_date, d.uploaded_flag, d.prescription_limit_days," +
-            "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code" +
+            "       isnull(fz_flag,0)fz_flag,isnull(is_central_purchase,0)is_central_purchase,purchase_code,drug_control_code" +
             " from " +
             " (select a.code, max(a.serial)serial" +
             " FROM yp_zd_dict a WITH(NOLOCK) ,yp_print_name b WITH(NOLOCK) " +
@@ -226,7 +226,7 @@ public interface YpZdDictMapper {
                     "  audit_code =b.audit_code , comment =b.comment , categories_flag =b.categories_flag , ym_flag =b.ym_flag , dpym_flag =b.dpym_flag ," +
                     "  father_flag =b.father_flag , yb_code2 =b.yb_code2 , yb_comment2 =b.yb_comment2 , kjyw_flag =b.kjyw_flag , ygyyjc_type =b.ygyyjc_type ," +
                     "  ddd_value =b.ddd_value , yp_id =b.yp_id , xtpp_name =b.xtpp_name , sp_name =b.sp_name , yb_comment_new =b.yb_comment_new ," +
-                    "  yb_bl_new =b.yb_bl_new , yb_flag_new =b.yb_flag_new , byj_flag =b.byj_flag" +
+                    "  yb_bl_new =b.yb_bl_new , yb_flag_new =b.yb_flag_new , byj_flag =b.byj_flag,drug_control_code =b.drug_control_code" +
                     " from ( select *from yp_zd_dict ) as b" +
                     " where yp_zd_dict.code =#{code} and yp_zd_dict.serial !=#{serial} and yp_zd_dict.code =b.code and b.serial =#{serial}",
             "</script>"})

src/main/java/cn/hnthyy/thmz/vo/YpZdDictVo.java

@@ -212,4 +212,6 @@ public class YpZdDictVo {
      * 复核人
      */
     private String fhNameText;
+    //药管平台码
+    private String drugControlCode;
 }

src/main/resources/static/js/yk/drug_info.js

@@ -39,7 +39,7 @@ $(function () {
         $.each(data, function (i, item) {
             formObject[item.name] = item.value;
         });
-        if(validator.checkAll($("#dataForm"))){
+        if(validator.checkAll($("#dataForm")) && formValidator(formObject)){
             request({
                 url: '/saveYpZdDict',
                 method: 'post',
@@ -76,9 +76,10 @@ $(function () {
             url: '/thmz/getYpZdDictByLike',
             onClickRow: function (data, $element) {
                 $('#drugSearchText').webuiPopover('hide');
+                console.log(data['auditCode']);
                 for (var key in data) {
                     if ($('#' + key).attr("type") === 'checkbox') {
-                        $('#' + key).attr("checked", data[key]);
+                        $('#' + key).prop("checked", data[key]==1?true:false);
                     } else {
                         $('#' + key).val(data[key]);
                         $('#' + key).val(data[key]);
@@ -787,6 +788,42 @@ function print() {
 function resetSearch() {
     $("#dataForm")[0].reset();
     $("select").selectpicker('refresh');
-    $("input[type='checkbox']").attr('checked', false);
+    $("input[type='checkbox']").prop('checked', false);
     $("#drugSearchText").val(null);
+}
+
+/**
+ * 效验数据
+ */
+function formValidator(data) {
+    if(isEmpty($("#weighUnit").val()) && isEmpty($("#volUnit").val())){
+        errorMesage({message:'重量和体积单位为空，请选择至少一个药品单位'});
+        return false;
+    }
+    if((!isEmpty($("#weighUnit").val()) && isEmpty($("#weight").val()))
+        || (isEmpty($("#weighUnit").val()) && !isEmpty($("#weight").val()))){
+        errorMesage({message:'重量值和单位必须同时为空或者不为空'});
+        return false;
+    }
+    if((!isEmpty($("#volUnit").val()) && isEmpty($("#volum").val()))
+        || (isEmpty($("#volUnit").val()) && !isEmpty($("#volum").val()))){
+        errorMesage({message:'体积值和单位必须同时为空或者不为空'});
+        return false;
+    }
+    if((data['isCentralPurchase']==1 && isEmpty(data['purchaseCode']))
+        || (data['isCentralPurchase']==0 && !isEmpty(data['purchaseCode']))){
+        errorMesage({message:'统一采购标记和采购编码必须同时为空或者不为空'});
+        return false;
+    }
+    if(!((isEmpty($("#kjywFlag").val()) && isEmpty($("#dddValue").val()) && isEmpty($("#dddUnit").val()))
+        || (!isEmpty($("#kjywFlag").val()) && !isEmpty($("#dddValue").val()) && !isEmpty($("#dddUnit").val())))){
+        errorMesage({message:'抗菌药物、DDD值和消耗单位必须同时为空或者不为空'});
+        return false;
+    }
+    if((data['zbFlag']==1 && isEmpty(data['zbSupplyer']))
+        || (data['zbFlag']==0 && !isEmpty(data['zbSupplyer']))){
+        errorMesage({message:'招标标记和中标供应商必须同时为空或者不为空'});
+        return false;
+    }
+    return true;
 }

src/main/resources/templates/yk/drug_info.html

@@ -107,16 +107,18 @@
                 <div class="item form-group thmz_alert">
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="code">药品编码
+                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="code" name="code" class="form-control col-md-7 col-xs-12" type="text" readonly>
+                            <input id="code" name="code" class="form-control col-md-7 col-xs-12" type="text" required="required" readonly>
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="serial">序号
+                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="serial" name="serial" class="form-control col-md-7 col-xs-12" type="text" readonly>
+                            <input id="serial" name="serial" class="form-control col-md-7 col-xs-12" type="text" required="required" readonly>
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -164,12 +166,11 @@
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="chemRemark">化学成分
-                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <input id="chemRemark" name="chemRemark" class="form-control col-md-7 col-xs-12"
                                    data-validate-length-range="1,16"
-                                   placeholder="请输入" required="required" type="text">
+                                   placeholder="请输入" type="text">
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -188,12 +189,11 @@
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="ynCode">院内码
-                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <input id="ynCode" name="ynCode" class="form-control col-md-7 col-xs-12"
                                    data-validate-length-range="1,8"
-                                   placeholder="请输入" required="required" type="text">
+                                   placeholder="请输入" type="text">
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -211,16 +211,18 @@
                 <div class="item form-group thmz_alert">
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="specification">规格
+                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="specification" name="specification" class="form-control col-md-7 col-xs-12" type="text" readonly>
+                            <input id="specification" name="specification" class="form-control col-md-7 col-xs-12" type="text" required="required" readonly>
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="specification2">最小规格
+                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="specification2" name="specification2" class="form-control col-md-7 col-xs-12" type="text" readonly>
+                            <input id="specification2" name="specification2" class="form-control col-md-7 col-xs-12" type="text" required="required" readonly>
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -258,10 +260,10 @@
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12"
-                               for="ypLevel">药品级别<span class="required">*</span></label>
+                               for="ypLevel">药品级别</label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <select class="form-control selectpicker show-tick"  title="请选择"
-                                    id="ypLevel" name="ypLevel" required="required">
+                                    id="ypLevel" name="ypLevel">
                                 <option value="1">非限制级</option>
                                 <option value="2">限制级</option>
                                 <option value="3">特殊级</option>
@@ -321,9 +323,10 @@
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="packSize">包装量
+                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="packSize" name="packSize" class="form-control col-md-7 col-xs-12" type="number">
+                            <input id="packSize" name="packSize" class="form-control col-md-7 col-xs-12" type="number" required="required">
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -337,19 +340,19 @@
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="packSize">采购编码
-                            <span class="required">*</span></label>
+                            </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="purchaseCode" name="purchaseCode" class="form-control col-md-7 col-xs-12" type="text" required="required" data-validate-length-range="1,20">
+                            <input id="purchaseCode" name="purchaseCode" class="form-control col-md-7 col-xs-12" type="text" data-validate-length-range="1,20">
                         </div>
                     </div>
-                    <div class="col-md-1 col-sm-1 col-xs-12">
-                        <input class="form-check-input" type="checkbox" id="ybFlag" name="ybFlag" value="1">
-                        <label class="form-check-label" for="ybFlag">医保自费</label>
-                    </div>
                     <div class="col-md-1 col-sm-1 col-xs-12">
                         <input class="form-check-input" type="checkbox" id="isCentralPurchase" name="isCentralPurchase" value="1">
                         <label class="form-check-label" for="isCentralPurchase">统一采购</label>
                     </div>
+                    <div class="col-md-1 col-sm-1 col-xs-12">
+                        <input class="form-check-input" type="checkbox" id="ybFlag" name="ybFlag" value="1">
+                        <label class="form-check-label" for="ybFlag">医保自费</label>
+                    </div>
                     <div class="col-md-1 col-sm-1 col-xs-12">
                         <input class="form-check-input" type="checkbox" id="fzFlag" name="fzFlag" value="1">
                         <label class="form-check-label" for="fzFlag">辅助用药</label>
@@ -477,21 +480,22 @@
                             </select>
                         </div>
                     </div>
+                </div>
+                <div class="item form-group thmz_alert">
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="auditCode">核算码
                             <span class="required">*</span></label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="auditCode" name="auditCode" class="form-control col-md-7 col-xs-12" type="text" required="required">
+                            <select class="form-control selectpicker show-tick" title="请选择" data-live-search="true"  multiple data-max-options="1"
+                                    id="auditCode" name="auditCode" required="required">
+                            </select>
                         </div>
                     </div>
-                </div>
-                <div class="item form-group thmz_alert">
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="exCode">扩展码
-                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="exCode" name="exCode" class="form-control col-md-7 col-xs-12" type="text" required="required">
+                            <input id="exCode" name="exCode" class="form-control col-md-7 col-xs-12" type="text">
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -521,14 +525,13 @@
                             <input id="dddUnit" name="dddUnit" class="form-control col-md-7 col-xs-12" type="text">
                         </div>
                     </div>
-                    <div class="col-md-2 col-sm-2 col-xs-12 item">
+                    <!--<div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="drugId">旧分类
-                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <input id="drugId" name="drugId" class="form-control col-md-7 col-xs-12" type="text">
                         </div>
-                    </div>
+                    </div>-->
                     <div class="col-md-1 col-sm-1 col-xs-12">
                         <input class="form-check-input" type="checkbox" id="ymFlag" name="ymFlag" value="1">
                         <label class="form-check-label" for="ymFlag">溶媒标志</label>
@@ -558,7 +561,7 @@
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <input id="manufactoryName" name="manufactoryName" class="form-control col-md-7 col-xs-12" type="text" required="required">
-                            <input id="manuCode" name="manuCode" type="hidden" required="required">
+                            <input id="manuCode" name="manuCode" type="text" required="required" placeholder="制药厂编码" readonly>
                         </div>
                     </div>
                     <div class="col-md-1 col-sm-1 col-xs-12">
@@ -567,11 +570,10 @@
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="supplyName">中标供应商
-                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <input id="supplyName" name="supplyName" class="form-control col-md-7 col-xs-12" type="text" required="required">
-                            <input id="zbSupplyer" name="zbSupplyer" type="hidden" required="required">
+                            <input id="zbSupplyer" name="zbSupplyer" type="text" required="required" placeholder="供应商编码" readonly>
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -591,13 +593,13 @@
                             <input id="comment" name="comment" class="form-control col-md-7 col-xs-12" type="text" data-validate-length-range="0,100">
                         </div>
                     </div>
-                    <div class="col-md-2 col-sm-2 col-xs-12 item">
+                    <!--<div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="ypId">药品ID
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
                             <input id="ypId" name="ypId" class="form-control col-md-7 col-xs-12" type="text">
                         </div>
-                    </div>
+                    </div>-->
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="xtppName">系统匹配名
                             <span class="required">*</span>
@@ -675,10 +677,11 @@
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
-                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="ybBlNew">报销比例
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="ybBlNew">报销比例(%)
+                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="ybBlNew" name="ybBlNew" class="form-control col-md-7 col-xs-12" type="text">
+                            <input id="ybBlNew" name="ybBlNew" class="form-control col-md-7 col-xs-12" type="number" required="required">
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
@@ -718,6 +721,13 @@
                             <input id="rsbYpid" name="rsbYpid" class="form-control col-md-7 col-xs-12" type="text" required="required" data-validate-length-range="1,17">
                         </div>
                     </div>
+                    <div class="col-md-2 col-sm-2 col-xs-12 item">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="drugControlCode">药管平台码
+                            <span class="required">*</span></label>
+                        <div class="col-md-8 col-sm-8 col-xs-12">
+                            <input id="drugControlCode" name="drugControlCode" class="form-control col-md-7 col-xs-12" type="text" required="required" data-validate-length-range="1,17">
+                        </div>
+                    </div>
                 </div>
             </form>
         </div>