Prechádzať zdrojové kódy

提交药品走库与管理品数据同步

bzd_wsp 6 mesiacov pred
rodič
commit
113ff6e08a

+ 2 - 2
health-admin/src/main/java/com/bzd/web/controller/gxhpz/DrugConfigController.java

@@ -76,7 +76,7 @@ public class DrugConfigController extends BaseController {
     public AjaxResult searchDrugs() throws Exception {
         PageData pd = this.getPageData();
        String query = (String) pd.get("query");
-        if(query.equals("") || query==null){
+        if(StringUtils.isNull(query)){
             return AjaxResult.success();
         }
         List<PageData> pds =drugConfigService.selectproductByCodeAndName(pd);
@@ -88,7 +88,7 @@ public class DrugConfigController extends BaseController {
     public AjaxResult searchDrugsObject() throws Exception {
         PageData pd = this.getPageData();
         String query = (String) pd.get("query");
-        if(query.equals("") || query==null){
+        if(StringUtils.isNull(query)){
             return AjaxResult.success();
         }
         PageData pdo =drugConfigService.selectOneproductByCodeAndName(pd);

+ 4 - 1
health-admin/src/main/resources/templates/gxhpz/drugconfigAdd.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('门店积分商品列表新增')" />
+    <th:block th:include="include :: header('新增患者管理品')" />
     <th:block th:include="include :: ztree-css" />
     <th:block th:include="include :: select2-css" />
     <th:block th:include="include :: bootstrap-select-css" />
@@ -315,6 +315,8 @@
                 $('#isColdChainManaged').val('');
                 $('#isRegisteredManaged').val('');
                 $('#isCharityAidManaged').val('');
+                $('#administrationMethod').val('');
+
             }
 
             // 填充表单字段
@@ -329,6 +331,7 @@
                 $('#isFollowUpManaged').val(data.follow_up_item);
                 $('#isColdChainManaged').val(data.cold_chain_item);
                 $('#isRegisteredManaged').val(data.registered_item);
+                $('#administrationMethod').val(data.drug_delivery_way);
                 $('#isCharityAidManaged').val(data.charity_aid_item);
 
                 dtp_flag = data.dtp_flag;

+ 4 - 4
health-admin/src/main/resources/templates/gxhpz/drugconfigEdit.html

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label class="is-required">药品编码:</label>
-                <input name="mdmCode" placeholder="药品编码" th:value="${mdmCode}" class="styled-input" type="text" disabled>
+                <input name="mdmCode" placeholder="药品编码" th:value="${mdmCode}" class="styled-input" type="text" readonly>
             </div>
             <div class="customize-form-group">
                 <label>D值品编码:</label>
@@ -32,15 +32,15 @@
 
             <div class="customize-form-group">
                 <label class="is-required">通用名:</label>
-                <input name="genericName" placeholder="通用名" th:value="${genericName}" class="styled-input" type="text" disabled>
+                <input name="genericName" placeholder="通用名" th:value="${genericName}" class="styled-input" type="text" readonly>
             </div>
             <div class="customize-form-group">
                 <label class="is-required">商品名:</label>
-                <input name="productName" placeholder="请输入商品名" th:value="${productName}" class="styled-input" type="text" disabled>
+                <input name="productName" placeholder="请输入商品名" th:value="${productName}" class="styled-input" type="text" readonly>
             </div>
             <div class="customize-form-group">
                 <label>厂家简称:</label>
-                <input name="manufacturerShortName" placeholder="请输入厂家简称" th:value="${manufacturerShortName}" class="styled-input" type="text" disabled>
+                <input name="manufacturerShortName" placeholder="请输入厂家简称" th:value="${manufacturerShortName}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label class="is-required">是否随访管理品:</label>

+ 2 - 2
health-admin/src/main/resources/templates/gxhpz/drugconfigList.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="format-detection" content="telephone=no">
-    <th:block th:include="include :: header('品配置')" />
+    <th:block th:include="include :: header('患者管理品配置')" />
     <th:block th:include="include :: layout-latest-css" />
     <th:block th:include="include :: ztree-css" />
 </head>
@@ -196,7 +196,7 @@
             importTemplateUrl: prefix + "/importTemplate",*/
             sortName: "d_value_code",
             sortOrder: "asc",
-            modalName: "药品配置",
+            modalName: "患者管理品",
             modalName2: "复购配置",
             fitColumns: true,
             striped: true,

+ 2 - 2
health-system/src/main/java/com/bzd/system/service/DTPService.java

@@ -330,7 +330,7 @@ public class DTPService {
         pd.put("registrant", pd.get("registrant"));
         pd.put("reviewingName", pd.get("reviewingName"));
         pd.put("drugQuantity", drugQuantity);
-
+        pd.put("prescriptionType", pd.get("prescriptionType"));
         // 患者信息
         pd.put("patientId", pd.get("patientId"));
         pd.put("patientName", pd.get("patientName"));
@@ -649,7 +649,7 @@ public class DTPService {
         pd.put("registrant", pd.get("registrant"));
         pd.put("reviewingName", pd.get("reviewingName"));
         pd.put("drugQuantity", drugQuantity);
-
+        pd.put("prescriptionType", pd.get("prescriptionType"));
         // 患者信息
 //        pd.put("patientId", pd.get("patientId"));
         pd.put("patientName", pd.get("patientName"));

+ 42 - 1
health-system/src/main/java/com/bzd/system/service/gxhpz/DrugConfigService.java

@@ -60,7 +60,26 @@ public class DrugConfigService {
     public int save(final PageData pd) throws Exception {
         pd.put("createdBy", getSysUser().getUserId());
         pd.put("createdTime", DateUtils.getTime());
-
+        //添加管理品时候同步总药库库信息
+        PageData pd12=new PageData();
+        pd12.put("drug_delivery_way", pd.get("administrationMethod"));//给药方式
+        pd12.put("registered_item", pd.get("isRegisteredManaged"));//登记品
+        pd12.put("follow_up_item", pd.get("isFollowUpManaged"));//随访品
+        pd12.put("cold_chain_item", pd.get("isColdChainManaged"));//冷链品
+        //pd12.put("flow_item", pd.get("enterpriseFlowManagement"));//流向品  待确认是否修改
+        pd12.put("charity_aid_item", pd.get("isCharityAidManaged"));//慈善援助品
+        pd12.put("product_code", pd.get("mdmCode"));//药品编码
+        int res12=daoSupport.update("SPProductinfoMapper.productUpdate12", pd12);
+        System.out.println("res12:s_gxhpz_product_dtpinfo表更改条数"+res12);
+        //添加管理品时候同步总药库库信息
+        PageData pd13=new PageData();
+        pd13.put("product_code", pd.get("mdmCode"));//药品编码
+        pd13.put("product_name", pd.get("productName"));//通用名
+        pd13.put("generic_name", pd.get("genericName"));//通用名
+        pd13.put("manufacturer_abbreviation", pd.get("manufacturerShortName"));//厂家简称
+        int res13=daoSupport.update("SPProductinfoMapper.productUpdate", pd13);
+        System.out.println("res13:s_gxhpz_product_info表更改条数"+res13);
+        //添加管理品
         return daoSupport.save("drugConfigMapper.addDrugConfig", pd);
     }
 
@@ -82,6 +101,8 @@ public class DrugConfigService {
      */
     public Integer update(PageData pd) throws Exception {
         String type = (String) pd.get("type");
+        //type=1的时候在配置D值品,需要把新增的D制品名称和编码存入管理品表 条件是根据mdmCode修改
+        //type=0的时候修改所有字段 条件是根据id修改
         if(type.equals("1")){
             int result1=0;
             String dValueId = (String) pd.get("dValueId");
@@ -125,6 +146,26 @@ public class DrugConfigService {
                 return 0;
             }
         }else{
+            //更新管理品时候同步总药库库信息s_gxhpz_product_dtpinfo表
+            PageData pd12=new PageData();
+            pd12.put("drug_delivery_way", pd.get("administrationMethod"));//给药方式
+            pd12.put("registered_item", pd.get("isRegisteredManaged"));//登记品
+            pd12.put("follow_up_item", pd.get("isFollowUpManaged"));//随访品
+            pd12.put("cold_chain_item", pd.get("isColdChainManaged"));//冷链品
+            //pd12.put("flow_item", pd.get("enterpriseFlowManagement"));//流向品 待确认是否修改
+            pd12.put("charity_aid_item", pd.get("isCharityAidManaged"));//慈善援助品
+            pd12.put("product_code", pd.get("mdmCode"));//药品编码
+            int res12=daoSupport.update("SPProductinfoMapper.productUpdate12", pd12);
+            System.out.println("res12:s_gxhpz_product_dtpinfo表更改条数"+res12);
+            //更新管理品时候同步总药库库信息s_gxhpz_product_info表
+            PageData pd13=new PageData();
+            pd13.put("product_code", pd.get("mdmCode"));//药品编码
+            pd13.put("product_name", pd.get("productName"));//通用名
+            pd13.put("generic_name", pd.get("genericName"));//通用名
+            pd13.put("manufacturer_abbreviation", pd.get("manufacturerShortName"));//厂家简称
+            int res13=daoSupport.update("SPProductinfoMapper.productUpdate", pd13);
+            System.out.println("res13:s_gxhpz_product_info表更改条数"+res13);
+            //更新患者管理品
             pd.put("updatedBy", getSysUser().getUserId());
             pd.put("updatedTime", DateUtils.getTime());
             return daoSupport.update("drugConfigMapper.updateDrugConfig", pd);

+ 23 - 0
health-system/src/main/java/com/bzd/system/service/spgl/SPProductinfoService.java

@@ -3,6 +3,7 @@ package com.bzd.system.service.spgl;
 import com.bzd.common.config.dao.DaoBase;
 import com.bzd.common.config.dao.DaoSupport;
 import com.bzd.common.config.dao.PageData;
+import com.bzd.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -10,6 +11,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
 
+import static com.bzd.common.utils.ShiroUtils.getSysUser;
+
 
 /**
 *
@@ -76,6 +79,24 @@ public class SPProductinfoService {
         }else {
             productAdd12(pd);
         }
+        //这里同步修改管理品的数据
+        PageData pdConfig=new PageData();
+        //更新患者管理品
+        pdConfig.put("updatedBy", getSysUser().getUserId());
+        pdConfig.put("updatedTime", DateUtils.getTime());
+        pdConfig.put("mdmCode",pd.get("product_code"));
+        pdConfig.put("administrationMethod",pd.get("drug_delivery_way"));
+        pdConfig.put("isRegisteredManaged",pd.get("registered_item"));
+        pdConfig.put("isFollowUpManaged",pd.get("follow_up_item"));
+        pdConfig.put("isColdChainManaged",pd.get("cold_chain_item"));
+        //pdConfig.put("enterpriseFlowManagement",pd.get("flow_item"));//暂时不考虑这值 待确认
+        pdConfig.put("isCharityAidManaged",pd.get("charity_aid_item"));
+        pdConfig.put("productName",pd.get("product_name"));
+        pdConfig.put("genericName",pd.get("generic_name"));
+        pdConfig.put("manufacturerShortName",pd.get("manufacturer_abbreviation"));//厂家简称
+        System.out.println("pdConfig患者管理品:"+pdConfig);
+        int result= daoSupport.update("drugConfigMapper.updateDrugConfig2", pdConfig);
+        System.out.println("result:这里同步修改管理品的数据s_gxhpz_drugconfig表更改条数"+result);
         return daoSupport.update("SPProductinfoMapper.productUpdate", pd);
     }
     public Integer productAdd2(PageData pd)throws Exception {
@@ -95,6 +116,8 @@ public class SPProductinfoService {
     }
 
     public Integer productAdd12(PageData pd)throws Exception {
+
+
         return daoSupport.update("SPProductinfoMapper.addProductAdd12", pd);
     }
 

+ 4 - 2
health-system/src/main/resources/mapper/gxhpz/drugConfigMapper.xml

@@ -15,7 +15,8 @@
             d.registered_item,
             d.follow_up_item,
             d.cold_chain_item,
-            d.charity_aid_item
+            d.charity_aid_item,
+            d.drug_delivery_way
         FROM
             s_gxhpz_product_info p
                 LEFT JOIN
@@ -32,7 +33,8 @@
             d.registered_item,
             d.follow_up_item,
             d.cold_chain_item,
-            d.charity_aid_item
+            d.charity_aid_item,
+            d.drug_delivery_way
         FROM
             s_gxhpz_product_info p
                 LEFT JOIN

+ 3 - 0
health-system/src/main/resources/mapper/spgl/SPProductinfoMapper.xml

@@ -1901,6 +1901,9 @@
                 <if test="follow_up_item != null and follow_up_item != ''">
                     follow_up_item=#{follow_up_item},
                 </if>
+                <if test="drug_delivery_way != null and drug_delivery_way != ''">
+                    drug_delivery_way=#{drug_delivery_way},
+                </if>
                 <if test="cold_chain_item != null and cold_chain_item != ''">
                     cold_chain_item=#{cold_chain_item},
                 </if>