药品入库优化

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

@@ -0,0 +1,245 @@
+package cn.hnthyy.thmz.entity.his.yp;
+
+import lombok.Data;
+
+/**
+ * @ClassName SelinfoSold
+ * @Author hsh
+ * @Date 2024/10/31 16:16
+ * @Version 1.0
+ * @Description 药品销售
+ **/
+@Data
+public class SelinfoSold {
+
+    /**
+     * 医疗目录编码（如果没有就填默认值NMLC999）
+     * */
+    private String medListCodg;
+
+
+    /**
+     * 定点医药机构目录编号
+     * */
+    private String fixmedinsHilistId;
+
+
+    /**
+     * 定点医药机构目录名称
+     * */
+    private String fixmedinsHilistName;
+
+
+    /**
+     * 定点医药机构批次流水号
+     * */
+    private String fixmedinsBchno;
+
+
+    /**
+     * 开方医师证件类型
+     * */
+    private String prscDrCertType;
+
+
+    /**
+     * 开方医师证件号码
+     * */
+    private String prscDrCertno;
+
+
+    /**
+     * 开方医师姓名
+     * */
+    private String prscDrName;
+
+
+    /**
+     * 药师证件类型
+     * */
+    private String pharCertType;
+
+
+    /**
+     * 药师证件号码
+     * */
+    private String pharCertno;
+
+
+    /**
+     * 药师姓名
+     * */
+    private String pharName;
+
+
+    /**
+     * 药师执业资格证号
+     * */
+    private String pharPracCertNo;
+
+
+    /**
+     * 医保费用结算类型
+     * */
+    private String hiFeesetlType;
+
+
+    /**
+     * 结算ID
+     * */
+    private String setlId;
+
+
+    /**
+     * 就医流水号
+     * */
+    private String mdtrtSn;
+
+
+    /**
+     * 人员编号
+     * */
+    private String psnNo;
+
+
+    /**
+     * 人员证件类型
+     * */
+    private String psnCertType;
+
+
+    /**
+     * 证件号码
+     * */
+    private String certno;
+
+
+    /**
+     * 人员姓名
+     * */
+    private String psnName;
+
+
+    /**
+     * 生产批号
+     * */
+    private String manuLotnum;
+
+
+    /**
+     * 生产日期
+     * */
+    private String manuDate;
+
+
+    /**
+     * 有效期止
+     * */
+    private String expyEnd;
+
+
+    /**
+     * 处方药标志
+     * */
+    private String rxFlag;
+
+
+    /**
+     * 拆零标志
+     * */
+    private String trdnFlag;
+
+
+    /**
+     * 最终成交单价
+     * */
+    private String finlTrnsPric;
+
+
+    /**
+     * 处方号
+     * */
+    private String rxno;
+
+
+    /**
+     * 外购处方标志
+     * */
+    private String rxCircFlag;
+
+
+    /**
+     * 零售单据号
+     * */
+    private String rtalDocno;
+
+
+    /**
+     * 销售出库单据号
+     * */
+    private String stooutNo;
+
+
+    /**
+     * 批次号
+     * */
+    private String bchno;
+
+
+    /**
+     * 药品追溯码
+     * */
+    private String drugTracCodg;
+
+
+    /**
+     * 药品条形码
+     * */
+    private String drugProdBarc;
+
+
+    /**
+     * 货架位
+     * */
+    private String shelfPosi;
+
+
+    /**
+     * 销售/退货数量
+     * */
+    private String selRetnCnt;
+
+
+    /**
+     * 销售/退货时间
+     * */
+    private String selRetnTime;
+
+
+    /**
+     * 销售/退货经办人姓名
+     * */
+    private String selRetnOpterName;
+
+
+    /**
+     * 备注
+     * */
+    private String memo;
+
+    /**
+     * 开方医师编号（医保结算必填，非电子处方不校验）
+     * */
+    private String prscDrNo;
+
+    /**
+     * 医保药师编号（医保结算必填）
+     * */
+    private String pharNo;
+
+    /**
+     * 创建时间
+     * */
+    private String createTime;
+
+}

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

@@ -57,7 +57,6 @@ public interface YpInDetlMapper {
             " rept_no =rtrim(max(a.rept_no))," +
             " supply_code =max(a.supply_code)," +
             " in_docu_no =rtrim(a.in_docu_no)," +
-            " drug_trac_codg =rtrim(a.drug_trac_codg)," +
             " purchaser =max(a.purchaser)," +
             " checker =max(a.checker)," +
             " buy_value=sum(round(buy_amt * buy_price,2))," +
@@ -86,7 +85,7 @@ public interface YpInDetlMapper {
             " and in_date <![CDATA[<=]]> #{endTime}" +
             "</when>" +
             "</where>" +
-            " group by a.in_docu_no,a.drug_trac_codg) as A WHERE RowNumber >#{pageSize}*#{pageIndex} order by RowNumber asc" +
+            " group by a.in_docu_no) as A WHERE RowNumber >#{pageSize}*#{pageIndex} order by RowNumber asc" +
             "</script>")
     List<YpInDetlVo> selectYpInDetlPage(YpInDetlVo ypInDetlVo);
 

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

@@ -283,11 +283,6 @@ function initRecordTable() {
                 title: '入库单号',
                 align: "center",
                 valign: 'middle'
-            }, {
-                field: 'drugTracCodg',
-                title: '药品追溯码',
-                align: "center",
-                valign: 'middle'
             },
             {
                 field: 'purchaserName',

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

@@ -207,7 +207,7 @@
 <!--药品信息弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="detailedFormModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 900px;margin-top: 50px;">
+        <div class="modal-content" style="width: 1350px;margin-left: -240px; margin-top: 50px;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -276,7 +276,7 @@
                                         </select>
                                     </div>
                                 </div>
-                                <label class="control-label col-md-2 col-sm-2 col-xs-12" for="manuNo">溯源码:
+                                <label class="control-label col-md-2 col-sm-2 col-xs-12" for="manuNo">追溯码:
                                 </label>
                                 <div class="col-md-2 col-sm-2 col-xs-12">
                                     <input id="drugTracCodg" name="drugTracCodg" class="form-control optional" type="text">