修改sop配置页面和药品添加bug修复处方登记bug修复

health-admin/src/main/java/com/bzd/web/controller/dtp/PharmaceuticalServiceController.java

@@ -155,7 +155,15 @@ public class PharmaceuticalServiceController extends BaseController {
     public String archivesView(@PathVariable("id") String Id, ModelMap mmap) throws Exception {
         PageData pd = this.getPageData();
         pd.put("id", Id);
-        PageData pageData = pharmaceuticalService.findArchivesList(pd).get(0);
+
+        PageData pageData1= new PageData();
+        List<PageData> list= pharmaceuticalService.findArchivesList(pd);
+        if(list.size()>0){
+             pageData1 = pharmaceuticalService.findArchivesList(pd).get(0);
+            mmap.put("dl",pageData1.get("dl"));
+            mmap.put("xl",pageData1.get("xl"));
+            mmap.putAll(pageData1);
+        }
         /*Object updatePatientBasicInfo =  pharmaceuticalService.findBasicInfoById(pd);
         if(StringUtils.isNotNull(updatePatientBasicInfo)){
             PageData BasicpageData = (PageData) updatePatientBasicInfo;
@@ -171,10 +179,6 @@ public class PharmaceuticalServiceController extends BaseController {
         pd.put("archiveId", Id);
         List<PageData>  records =pharmaceuticalService.findrecordsByarchiveId(pd);
         mmap.put("recordsData",records);
-        mmap.put("dl",pageData.get("dl"));
-        mmap.put("xl",pageData.get("xl"));
-
-        mmap.putAll(pageData);
         return prefix_archives + "/archivesEdit";
     }
 
@@ -292,7 +296,7 @@ public class PharmaceuticalServiceController extends BaseController {
             }
             if (pharmaceuticalService.checkPatientIsExist(pd))
             {
-                return AjaxResult.error("患者建档新增保存： '" + pd.getString("name") +"+"+ pd.getString("documentNumber") +"+" +pd.getString("phoneNumber")+"'失败，患者姓,身份证名或电话已存在");
+                return error("患者建档新增保存： '" + pd.getString("name") +"+"+ pd.getString("documentNumber") +"+" +pd.getString("phoneNumber")+"'失败，患者姓,身份证名或电话已存在");
             }
 
             PageData pdc = pharmaceuticalService.addArchivesCallback(pd);

health-admin/src/main/resources/templates/dtp/archives/archivesAdd.html

@@ -191,6 +191,7 @@
 
 <script>
     var prefix = ctx + "dtp/pmService";
+    var smName;
     $(document).ready(function() {
         $('#documentNumber').on('input', function() {
             idCard();
@@ -368,6 +369,9 @@
                 $.modal.alert('请至少选择一个疾病选项！');
                 return;
             }
+        if($.common.isNotEmpty(smName)){
+         data.push({name: "smName", value: smName});
+        }
         data.push({name: "dl", value: DL});
         data.push({name: "age", value: $("#age").val()});
         data.push({name: "dateBirth", value: $("#dateBirth").val()});
@@ -383,9 +387,14 @@
                 $.modal.alertError("系统错误");
             },
             success : function(data) {
-                $.operate.successCallback(data);
-                $.modal.close();
-                return data;
+                if(data.code==500){
+                    $.modal.alertError(data.msg);
+                    return ;
+                }else{
+                    $.operate.successCallback(data);
+                    $.modal.msg("保存成功");
+                    $.modal.close();
+                }
             }
         });
     }
@@ -447,6 +456,7 @@
                     }else if (gender == "未知"){
                         $("#gender").val("2");
                     }
+                    smName=name;
                     // 将提取的信息填充到表单中
                     document.getElementById('name').value = name;
                     document.getElementById('documentNumber').value = idNumber;

health-admin/src/main/resources/templates/dtp/archives/archivesAddCallback.html

@@ -150,6 +150,7 @@
 </html>
 <script>
     var prefix = ctx + "dtp/pmService";
+    var smName;
     $(document).ready(function() {
         $('#documentNumber').on('input', function() {
             idCard();
@@ -327,6 +328,9 @@
                 $.modal.alert('请至少选择一个疾病选项！');
                 return;
             }
+        if($.common.isNotEmpty(smName)){
+            data.push({name: "smName", value: smName});
+        }
         data.push({name: "dl", value: DL});
         data.push({name: "age", value: $("#age").val()});
         data.push({name: "dateBirth", value: $("#dateBirth").val()});
@@ -341,10 +345,16 @@
                 $.modal.alertError("系统错误");
             },
             success : function(responseData) {
-                $.operate.successCallback1(responseData);
-                // 关闭模态窗口
-                $.modal.close();
-                $.modal.msgSuccessReload();
+                if(data.code==500){
+                    $.modal.alertError(data.msg);
+                    return ;
+                }else{
+                    $.operate.successCallback1(responseData);
+                    $.modal.msg("保存成功");
+                    // 关闭模态窗口
+                    $.modal.close();
+                    $.modal.msgSuccessReload();
+                }
             }
         });
     }
@@ -407,6 +417,7 @@
                     }else if (gender == "未知"){
                         $("#gender").val("2");
                     }
+                    smName=name;
                     // 将提取的信息填充到表单中
                     document.getElementById('name').value = name;
                     document.getElementById('documentNumber').value = idNumber;

health-admin/src/main/resources/templates/dtp/archives/archivesEdit.html

@@ -1137,7 +1137,6 @@
                     value: '',
                     text : '请选择疾病'
                 }).appendTo(options6);
-debugger;
                 // 回显数据
                 var dl = /*[[${dl}]]*/ '';
                 // 直接使用 dl 数据预填充下拉列表

health-system/src/main/java/com/bzd/system/service/PharmaceuticalService.java

@@ -36,6 +36,7 @@ public class PharmaceuticalService {
 //    }
 
     public List<PageData> findArchivesList(PageData pd) throws Exception{
+
         return (List<PageData>) daoSupport.findForList("PharmaceuticalServiceMapper.selectArchivesListLinkDrugs", pd);
     }
 
@@ -238,9 +239,12 @@ public class PharmaceuticalService {
     }
 
     public boolean checkPatientIsExist(PageData pd) throws Exception{
-        Object pageData =daoSupport.findForList("PharmaceuticalServiceMapper.checkPatientIsExist", pd);
-        return StringUtils.isNull(pageData);
-
+        List<PageData> pdlist = (List<PageData>) daoSupport.findForList("PharmaceuticalServiceMapper.checkPatientIsExist", pd);
+        if(pdlist.size()>0){
+            return true;
+        }else{
+            return false;
+        }
     }
     public Object selectPatientById(PageData pd) throws Exception{
         Object PageData =daoSupport.findForList("PharmaceuticalServiceMapper.selectPatientById", pd);
@@ -256,12 +260,22 @@ public class PharmaceuticalService {
         if (StringUtils.isNull(storeName)) {
             pd.put("storeName", getSysUser().getDept().getDeptName());
         }
+        String name = (String) pd.get("name");
+        String smName = (String) pd.get("smName");
+        if (StringUtils.isNotEmpty(smName)) {
+            if(name.equals(smName)){
+                pd.put("realNameStatus", 1);
+            }else{
+                pd.put("realNameStatus", 0);
+            }
+        }else{
+            pd.put("realNameStatus", 2);
+        }
         pd.put("storeId", getSysUser().getDeptId());//这里系统先自动获取系统所登录的门店
         pd.put("creator", getSysUser().getLoginName());//创建人
         pd.put("createTime", DateUtils.getTime());//创建时间
         pd.put("archiveCreator", getSysUser().getLoginName());//档案创建人
         pd.put("archiveCompleteStatus", 0);//档案是否完善 1已完善 0未完善
-        pd.put("realNameStatus", 0);//是否实名 1已经实名 0未实名 待对接服务校验
 
         return daoSupport.update("PharmaceuticalServiceMapper.insertArchiveRecord", pd);
     }
@@ -274,12 +288,22 @@ public class PharmaceuticalService {
         if (StringUtils.isNull(storeName)) {
             pd.put("storeName", getSysUser().getDept().getDeptName());
         }
+        String name = (String) pd.get("name");
+        String smName = (String) pd.get("smName");
+        if (StringUtils.isNotEmpty(smName)) {
+            if(name.equals(smName)){
+                pd.put("realNameStatus", 1);
+            }else{
+                pd.put("realNameStatus", 0);
+            }
+        }else{
+            pd.put("realNameStatus", 2);
+        }
         pd.put("storeId", getSysUser().getDeptId());//这里系统先自动获取系统所登录的门店
         pd.put("creator", getSysUser().getLoginName());//创建人
         pd.put("createTime", DateUtils.getTime());//创建时间
         pd.put("archiveCreator", getSysUser().getLoginName());//档案创建人
         pd.put("archiveCompleteStatus", 0);//档案是否完善 1已完善 0未完善
-        pd.put("realNameStatus", 0);//是否实名 1已经实名 0未实名 待对接服务校验
       int result =  daoSupport.update("PharmaceuticalServiceMapper.insertArchiveRecord", pd);
 
       if(result>0){

health-system/src/main/resources/mapper/pmServiceMapper/PharmaceuticalServiceMapper.xml

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    h.name,
 		    h.gender,
 		    h.age,
+		    h.dateBirth,
 		    h.phoneNumber,
 		    h.documentNumber,
 		    h.documentType,
@@ -149,15 +150,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<!-- 检查患者是否存在name LIKE CONCAT('%', #{name}, '%') -->
 	<select id="checkPatientIsExist" parameterType="pd" resultType="pd">
 		select name,phoneNumber,documentNumber from s_dtp_ysfw_archive_management where 1=1
-		<if test="name!= null and name!=''">
-			and name =#{name}
+		<if test="documentNumber!= null and documentNumber!=''">
+			and documentNumber=#{documentNumber}
 		</if>
-<!--		<if test="documentNumber!= null and documentNumber!=''">-->
-<!--			and documentNumber=#{documentNumber}-->
-<!--		</if>-->
 		<if test="phoneNumber!= null and phoneNumber!=''">
-			and phoneNumber=#{phoneNumber}
+			or phoneNumber=#{phoneNumber}
 		</if>
+
 	</select>
 	<select id="slectPatientByNameOrPhone" parameterType="pd" resultType="pd">
 	select * from s_dtp_ysfw_archive_management where  1=1  AND  name LIKE CONCAT('%', #{query}, '%') or phoneNumber=#{query}

health-system/src/main/resources/mapper/system/DTPMapper.xml

@@ -566,7 +566,7 @@
         from s_dtp_pzxx_hospital_list
         <where>
             <if test="id != null and id != ''">AND id = #{id}</if>
-            <if test="createdBy != null and createdBy != ''">AND createdBy = #{createdBy}</if>
+            <if test="createdBy != null and createdBy != ''">AND createBy = #{createdBy}</if>
             <if test="standardName != null and standardName != ''">
                 AND standardName like concat('%', #{standardName}, '%')
             </if>
@@ -575,14 +575,14 @@
             <if test="storeName != null and storeName != ''">AND storeName = #{storeName}</if>
             <if test="phone != null and phone != ''">AND phone = #{phone}</if>
             <if test="create_time_start != null and create_time_start != '' and create_time_end != null and create_time_end != ''">
-                AND create_time BETWEEN #{create_time_start} AND #{create_time_end}
+                AND createTime BETWEEN #{create_time_start} AND #{create_time_end}
             </if>
             <if test="updated_time_start != null and updated_time_start != '' and updated_time_end != null and updated_time_end != ''">
-                AND updated_time BETWEEN #{updated_time_start} AND #{updated_time_end}
+                AND updateTime BETWEEN #{updated_time_start} AND #{updated_time_end}
             </if>
             AND del_flag =0
         </where>
-        order by create_time desc
+        order by createTime desc
     </select>