Browse Source

update 修改先销售后登记 不能先显示成tab 以及bug修复

bzd_lxf 3 months ago
parent
commit
4c4e054fed

+ 1 - 1
health-admin/src/main/resources/logback.xml

@@ -3,7 +3,7 @@
     <!-- 日志存放路径 -->
 	<property name="log.path" value="/home/HealthFileData/logs" />
     <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+	<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
 	<!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">

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

@@ -4,7 +4,12 @@
     <th:block th:include="include :: header('档案明细')" />
 </head>
 <style>
-
+    .select2-dropdown {
+        z-index: 9999 !important;
+    }
+    .tabs-container {
+        position: relative;
+    }
 </style>
 <script>
 
@@ -15,8 +20,6 @@
                 <div class="col-sm-12">
                     <div class="tabs-container">
                         <ul class="nav nav-tabs" id="myTabs3">
-                            <!--<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">基本信息(快速建档信息)</a>
-                            </li>-->
                             <li class="active"><a data-toggle="tab" href="#tab-2" aria-expanded="false">首患建档</a>
                             </li>
                             <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false" > 用药购药</a>
@@ -27,163 +30,6 @@
                             </li>
                         </ul>
                         <div class="tab-content">
-                            <!-- 需要隐藏的div -->
-                            <!--<div id="tab-1" class="tab-pane active">
-                                        <form class="customize-search-form" id="form-server-edit1" >
-                                        <input type="hidden" id="id" name="id" th:value="${id}">
-                                        <div class="customize-form-group edit">
-                                            <label class="control-label is-required">姓名:</label>
-                                            <input name="name" id="name"  placeholder="请输入姓名" class="styled-input edit_inputs"  type="text" maxlength="30" th:value="${name}" disabled="true">
-                                            &nbsp; <i class="fa" th:class="${realNameStatus == 1 ? 'fa fa-check' : 'fa fa-close'}" id="checkName"  ></i>
-                                            &nbsp;
-                                            <input name="realNameStatus" id="realNameStatus" class="status" type="text"   th:value="${realNameStatus == 1 ? '已实名' : (realNameStatus == 0 ? '未实名' : '')}" readonly>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label>性别:</label>
-                                            <select name="gender" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_user_sex')}" disabled="true">
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                                        th:selected="${dict.dictValue} == ${gender}" ></option>
-                                            </select>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label>出生年月:</label>
-                                            <input name="dateBirth" id="dateBirth" placeholder="出生年月" class="styled-input edit_inputs"  type="text"    th:value="${dateBirth}" disabled="true">
-                                            <span class="status" style="width: 66px">
-                                                <input  name="age" type="text" id="age" th:value="${age}" style="text-align: center;width: 30px;border: none;" readonly>
-                                                岁
-                                            </span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label class="control-label is-required">手机号:</label>
-                                            <input name="phoneNumber" id="phoneNumber" placeholder="请输入手机号" class="styled-input edit_inputs" type="text" maxlength="30" th:value="${phoneNumber}" required>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-
-                                        <div class="customize-form-group edit">
-                                            <label >证件号码:</label>
-                                            <input name="documentType" placeholder="证件类型" class="styled-input short" type="text"  th:value="${documentType}" disabled="true">
-                                            <input name="documentNumber" placeholder="请输入证件号码" class="styled-input edit_inputs1" type="text" maxlength="30" th:value="${documentNumber}" disabled="true">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit select-time">
-                                            <label >首次确诊时间:</label>
-                                            <input name="timeFirstDiagnosis" placeholder="首次确诊时间" class="time-input styled-input edit_inputs"  type="text"  th:value="${timeFirstDiagnosis}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group">
-                                            <label class="col-sm-1 control-label">配送地址:</label>
-                                            <input name="creator" placeholder="配送地址"  id="creator" class="styled-input edit_inputs" type="text" th:value="${creator}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group">
-                                            <label class="col-sm-1 control-label">联系人手机号:</label>
-                                            <input name="contactPhone" placeholder="联系人手机号"  id="contactPhone" class="styled-input edit_inputs" type="text" th:value="${contactPhone}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group">
-                                            <label class="col-sm-1 control-label">联系人姓名:</label>
-                                            <input name="contactName" placeholder="联系人姓名"  id="contactName" class="styled-input edit_inputs" type="text" th:value="${contactName}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        &lt;!&ndash;<div class="customize-form-group edit">
-                                            <label >社保卡号:</label>
-                                            <input name="socialSecurityCard" placeholder="社保卡号" class="styled-input edit_inputs" type="text"   th:value="${socialSecurityCard}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >身高:</label>
-                                            <input name="height" id="height" placeholder="请输入身高" class="styled-input edit_inputs" type="number"  th:value="${height}">
-                                            <span class="status" style="width: 66px">&nbsp;cm</span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >体重:</label>
-                                            <input name="weight" id="weight" placeholder="请输入体重" class="styled-input edit_inputs" type="number"  th:value="${weight}">
-                                            <span class="status" style="width: 66px">&nbsp;kg</span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >BMI:</label>
-                                            <input name="BMI" id="BMI" placeholder="BMI值" class="styled-input edit_inputs" type="text"  th:value="${BMI}" readonly>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >民族:</label>
-                                            <select name="nation" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mz')}">
-                                                <option value="">请选择</option>
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                                        th:selected="${dict.dictLabel}==${nation}"></option>
-                                            </select>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >籍贯:</label>
-                                            <select name="nativePlace" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_jg')}" >
-                                                <option value="">请选择</option>
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                                        th:selected="${dict.dictLabel}==${nativePlace}"></option>
-                                            </select>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >座机号码:</label>
-                                            <input name="landlineNumber" placeholder="请输入座机号码" class="styled-input edit_inputs" type="text" maxlength="30" th:value="${landlineNumber}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-
-                                        <div class="customize-form-group edit">
-                                            <label class="control-label is-required">慢病肿瘤类型:</label>
-                                            <select name="chronicTumorType" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mbzllx')}" required>
-                                                <option value="">请选择</option>
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                                        th:selected="${dict.dictLabel}==${chronicTumorType}"></option>
-                                            </select>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit select-time">
-                                            <label >首次确诊时间:</label>
-                                            <input name="timeFirstDiagnosis" placeholder="首次确诊时间" class="time-input styled-input edit_inputs"  type="text"  th:value="${timeFirstDiagnosis}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-
-                                        <div class="customize-form-group edit">
-                                            <label class="control-label is-required">疾病类型:</label>
-                                            <select name="diseaseType" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_jblx')}"  required>
-                                                <option value="">请选择</option>
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                        th:selected="${dict.dictLabel}==${diseaseType}"></option>
-                                            </select>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >治疗线收集:</label>
-                                            <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_zlxsj')}">
-                                                <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:checked="${dict.dictLabel}==${healingLineCollection}"  name="healingLineCollection">
-                                            </div>
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >保险:</label>
-                                            <div class="selected-values" id="selected-values" style="display: none;"></div>
-                                            <select name="insurance" id="insurance" class="noselect2 selectpicker mySelectClass" multiple  data-none-selected-text="请选择" th:with="type=${@dict.getType('sys_select_dtp_ysfw_bxlx')}">
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                        th:selected="${dict.dictLabel}==${insurance}"></option>
-                                            </select>
-                                            <input type="hidden" id="insuranceValue" name="insuranceValue" value="">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >临床诊断:</label>
-                                            <input name="disease" placeholder="请输入临床诊断信息" class="styled-input edit_inputs" type="text"  th:value="${disease}">
-                                            <span class="span_line" readonly></span>
-                                        </div>
-                                        <div class="customize-form-group edit">
-                                            <label >上翻状态:</label>
-                                            <input name="flipStatus" class="styled-input edit_inputs" id="flipStatus" style="border: none" type="text"
-                                                   th:value="${flipStatus == 1 ? '已上翻' : (flipStatus == 2 ? '未上翻' : '')}" disabled readonly>
-                                            <a href="#" onclick="unbound()" style="width: 66px;" id="unboundflipStatus">&nbsp;&nbsp;解绑</a>
-                                        </div>&ndash;&gt;
-                                    </form>
-                            </div>-->
                             <div id="tab-2" class="tab-pane active">
                              <form class="form-horizontal" id="form-server-edit">
                                 <input type="hidden" id="id2" name="id" th:value="${id}">
@@ -198,14 +44,6 @@
                                         </li>
                                         <li class=""><a data-toggle="tab" href="#tab-23" aria-expanded="false">慢性疾病情况</a>
                                         </li>
-                                        <!--<li class=""><a data-toggle="tab" href="#tab-24" aria-expanded="false">患病史</a>
-                                        </li>
-                                        <li class=""><a data-toggle="tab" href="#tab-25" aria-expanded="false">治疗手段</a>
-                                        </li>
-                                        <li class=""><a data-toggle="tab" href="#tab-26" aria-expanded="false">用药情况</a>
-                                        </li>
-                                        <li class=""><a data-toggle="tab" href="#tab-27" aria-expanded="false">其他信息</a>-->
-                                        </li>
                                     </ul>
                                 </div>
                                  <div id="tab-20" class="tab-pane  fade in active">
@@ -254,51 +92,58 @@
                                                  <span class="span_line" readonly></span>
                                              </div>
                                              <div class="customize-form-group">
-                                                 <label class="col-sm-1 control-label">配送地址:</label>
+                                                 <label class="control-label">配送地址:</label>
                                                  <input name="addr" placeholder="配送地址"  id="addr" class="styled-input edit_inputs" type="text" th:value="${addr}">
                                                  <span class="span_line" readonly></span>
                                              </div>
                                              <div class="customize-form-group">
-                                                 <label class="col-sm-1 control-label">联系人手机号:</label>
+                                                 <label class="control-label">联系人手机号:</label>
                                                  <input name="contactPhone" placeholder="联系人手机号"  id="contactPhone" class="styled-input edit_inputs" type="text" th:value="${contactPhone}">
                                                  <span class="span_line" readonly></span>
                                              </div>
                                              <div class="customize-form-group">
-                                                 <label class="col-sm-1 control-label">联系人姓名:</label>
+                                                 <label class="control-label">联系人姓名:</label>
                                                  <input name="contactName" placeholder="联系人姓名"  id="contactName" class="styled-input edit_inputs" type="text" th:value="${contactName}">
                                                  <span class="span_line" readonly></span>
                                              </div>
-                                             <div class="customize-form-group-container">
-                                                 <div class="customize-form-group">
-                                                     <label class="col-sm-1 control-label">肿瘤发病部位疾病:</label>
-                                                     <select id="category-select1"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
-                                                     </select>
-                                                 </div>
-                                                 <div class="customize-form-group">
-                                                     <label class="col-sm-1 control-label">肿瘤治疗并发症与合并症:</label>
-                                                     <select id="category-select2" class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
-                                                     </select>
-                                                 </div>
-                                                 <div class="customize-form-group">
-                                                     <label class="col-sm-1 control-label">风湿免疫疾病名称:</label>
-                                                     <select id="category-select3"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
-                                                     </select>
-                                                 </div>
-                                                 <div class="customize-form-group">
-                                                     <label class="col-sm-1 control-label">罕见病疾病:</label>
-                                                     <select id="category-select4" class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
-                                                     </select>
-                                                 </div>
-                                                 <div class="customize-form-group">
-                                                     <label class="col-sm-1 control-label">感染类疾病:</label>
-                                                     <select id="category-select5"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
-                                                     </select>
-                                                 </div>
-                                                 <div class="customize-form-group">
-                                                     <label class="col-sm-1 control-label">临时慢病:</label>
-                                                     <select id="category-select6"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
-                                                     </select>
-                                                 </div>
+
+                                         </div>
+                                         <div class="customize-search-form">
+                                             <div class="customize-form-group">
+                                                 <label class="control-label">肿瘤发病部位疾病:</label>
+                                                 <select id="category-select1"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
+                                                 </select>
+                                                 <span class="span_line" readonly></span>
+                                             </div>
+                                             <div class="customize-form-group">
+                                                 <label class="control-label">肿瘤治疗并发症与合并症:</label>
+                                                 <select id="category-select2" class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
+                                                 </select>
+                                                 <span class="span_line" readonly></span>
+                                             </div>
+                                             <div class="customize-form-group">
+                                                 <label class="control-label">风湿免疫疾病名称:</label>
+                                                 <select id="category-select3"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
+                                                 </select>
+                                                 <span class="span_line" readonly></span>
+                                             </div>
+                                             <div class="customize-form-group">
+                                                 <label class="control-label">罕见病疾病:</label>
+                                                 <select id="category-select4" class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
+                                                 </select>
+                                                 <span class="span_line" readonly></span>
+                                             </div>
+                                             <div class="customize-form-group">
+                                                 <label class="control-label">感染类疾病:</label>
+                                                 <select id="category-select5"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
+                                                 </select>
+                                                 <span class="span_line" readonly></span>
+                                             </div>
+                                             <div class="customize-form-group">
+                                                 <label class="control-label">临时慢病:</label>
+                                                 <select id="category-select6"   class="styled-input edit_inputs select2-multiple" multiple placeholder="请选择或输入搜索">
+                                                 </select>
+                                                 <span class="span_line" readonly></span>
                                              </div>
                                          </div>
                                      </div>
@@ -308,7 +153,6 @@
                                         <strong>一般信息、家族史和既往史</strong>
                                         <div class="customize-search-form">
                                             <div class="customize-form-group edit">
-                                                <!--<label class="control-label">身高:</label>--><!-- 这里如果使用<label class="control-label"> 的class 会使用框架中定义的小屏幕的格式 -->
                                                 <label>身高:</label>
                                                 <input name="height" id="heighth" placeholder="请输入身高" class="styled-input edit_inputs" type="number"  th:value="${height}">
                                                 <span class="status">
@@ -384,19 +228,6 @@
                                                     </select>
                                                     <span class="status"></span>
                                                 </div>
-
-                                                <!--<div class="customize-form-group edit">
-                                                    <label>疾病史描述:</label>
-                                                    <input name="medicalHistoryDescription" placeholder="疾病史描述" class="styled-input edit_inputs" type="text"  th:value="${medicalHistoryDescription}">
-                                                </div>
-                                                <div class="customize-form-group edit">
-                                                     <label>传染病史描述:</label>
-                                                     <input name="infectiousDiseaseHistoryDescription" placeholder="传染病史描述" class="styled-input edit_inputs" type="text"  th:value="${infectiousDiseaseHistoryDescription}">
-                                                 </div>
-                                                 <div class="customize-form-group edit">
-                                                     <label>既往药物不良反应史:</label>
-                                                     <input name="pastAdverseDrugReactionHistory" placeholder="既往药物不良反应史" class="styled-input edit_inputs" type="text"  th:value="${pastAdverseDrugReactionHistory}">
-                                                 </div>-->
                                             </div>
                                             <div class="customize-search-form">
                                                 <div class="customize-search-form">
@@ -410,146 +241,6 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <!--<div class="customize-search-form">
-                                                <div class="customize-form-group edit">
-                                                    <div style="/*display: flex;*/">
-                                                        <label style="width: auto;">家族史:</label>
-                                                        <button type="button"  data-toggle="modal" data-target="#myModal" class="btn btn-xs btn-primary">新增</button>
-                                                        <table id="familyHistoryTable" style="width: 340px;">
-                                                            <thead>
-                                                            <tr>
-                                                                <th>序号</th>
-                                                                <th>疾病</th>
-                                                                <th>家庭成员</th>
-                                                                <th>操作</th>
-                                                            </tr>
-                                                            </thead>
-                                                            <tbody id="familyHistoryTableBody">
-                                                            &lt;!&ndash; 表格行将在这里动态添加 &ndash;&gt;
-                                                            </tbody>
-                                                        </table>
-                                                    </div>
-                                                    <div class="modal inmodal" id="myModal" tabindex="-1" role="dialog" aria-hidden="true">
-                                                        <div class="modal-dialog">
-                                                            <form class="form-horizontal" id="form-jzs-add">
-                                                                <div class="modal-content animated bounceInRight">
-                                                                    <div class="modal-header">
-                                                                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
-                                                                        </button>
-                                                                        <h4 class="modal-title">家族史</h4>
-                                                                    </div>
-                                                                    <div class="modal-body">
-                                                                        <div class="customize-search-form">
-                                                                            <div class="customize-form-group edit">
-                                                                                <label >疾病</label>
-                                                                                <input type="text" name="disease" placeholder="请输入疾病" class="styled-input edit_inputs"  style="width: 200px;" id="disease">
-                                                                            </div>
-                                                                        </div>
-                                                                        <div class="customize-search-form">
-                                                                            <div class="customize-form-group edit">
-                                                                                <label>家庭成员</label>
-                                                                                <select name="member" class="styled-input edit_inputs"  style="width: 200px;" th:with="type=${@dict.getType('sys_select_dtp_ysfw_lxryhzgx')}" id="member">
-                                                                                    <option value="">请选择家庭成员</option>
-                                                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                                                            th:selected="${dict.dictLabel}==${member}"></option>
-                                                                                </select>
-                                                                            </div>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="modal-footer">
-                                                                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                                                        <button type="button" class="btn btn-primary" onclick="saveRow(1)">保存</button>
-                                                                    </div>
-                                                                </div>
-                                                            </form>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>-->
-                                            <!--<div class="customize-form-group edit">
-                                                <label class="is-required">保险:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_bxlx')}" id="targetInsuranceDiv">
-                                                    <input type="checkbox" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   name="insurance2">
-                                                </div>
-                                                <div class="error-message" id="insurance-error">请选择至少一项保险</div>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label  >经济状况:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_mqjjzt')}">
-                                                    <input type="radio" class="form-check-radio"  th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"   th:checked="${dict.dictLabel}==${currentEconomicSituation}" name="currentEconomicSituation" >
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label class="is-required">患者是否知情:</label>
-                                                <select name="patientAwareness" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_yes_no')}" required>
-                                                    <option value="">请选择</option>
-                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                            th:selected="${dict.dictLabel}==${patientAwareness}"></option>
-                                                </select>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label>是否反馈医生:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
-                                                    <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${followUpFeedbackDoctor}"  name="followUpFeedbackDoctor" >
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label>心率:</label>
-                                                <select name="heartRate" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_xl')}" placeholder="请选择心率">
-                                                    <option value="">请选择心率</option>
-                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                            th:selected="${dict.dictLabel}==${heartRate}"></option>
-                                                </select>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label>血压:</label>
-                                                <select name="bloodPressureStatus" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_xueya')}">
-                                                    <option value="">请选择</option>
-                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                            th:selected="${dict.dictLabel}==${bloodPressureStatus}"></option>
-                                                </select>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label>吸烟史:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_xys')}">
-                                                    <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"  th:checked="${dict.dictLabel}==${smokingHistory}" name="smokingHistory" >
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label>饮酒史:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_yjs')}">
-                                                    <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:checked="${dict.dictLabel}==${drinkingHistory}"   name="drinkingHistory" >
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label>运动习惯:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
-                                                    <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:checked="${dict.dictLabel}==${exerciseHabit}"  name="exerciseHabit" >
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label>饮食偏好:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_ysph')}" id="dietaryPreferenceDiv">
-                                                    <input type="checkbox" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" name="dietaryPreference">
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>
-                                            <div class="customize-form-group edit">
-                                                <label >睡眠状况:</label>
-                                                <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_smzk')}" id="sleepConditionDiv">
-                                                    <input type="checkbox" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" name="sleepCondition">
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>-->
                                         </div>
                                     </div>
                                 </div>
@@ -595,15 +286,6 @@
                                                 </select>
                                                 <span class="status"></span>
                                             </div>
-                                            <!--<div class="customize-form-group edit">
-                                                <label>分子分型监测:</label>
-                                                <select name="diseaseType" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_jblx')}" required>
-                                                    <option value="">请选择</option>
-                                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                            th:selected="${dict.dictLabel}==${diseaseType}"></option>
-                                                </select>
-                                                <span class="status"></span>
-                                            </div>-->
                                             <div class="customize-form-group edit">
                                                 <label>PD-L1表达:</label>
                                                 <select name="pdl1"  class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_pdl1')}" required>
@@ -613,11 +295,6 @@
                                                 </select>
                                                 <span class="status"></span>
                                             </div>
-                                            <!--<div class="customize-form-group edit">
-                                                <label>临床诊断:</label>
-                                                <input name="disease" placeholder="请输入临床诊断" class="styled-input edit_inputs" type="text" maxlength="30" th:value="${disease}">
-                                                <span class="status"></span>
-                                            </div>-->
                                             <div class="customize-form-group edit">
                                                 <label>治疗手段:</label><!-- 值配置到字典-->
                                                 <select name="zlsd"  class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_zlsd')}" required>
@@ -641,24 +318,7 @@
                                                 </div>
                                                 <span class="status"></span>
                                             </div>
-
-                                            <!--<div class="customize-form-group edit">
-                                                <label class="is-required">首次确诊时间:</label>
-                                                <div class="input-groups select-time">
-                                                    <input name="timeFirstDiagnosis" placeholder="首次确诊时间" class="time-input-new styled-input" type="text"  th:value="${timeFirstDiagnosis}" required>
-                                                </div>
-                                                <span class="status"></span>
-                                            </div>-->
                                         </div>
-                                        <!--<div class="customize-search-form">
-                                            <div class="customize-form-group edit">
-                                                <label>伴随症状:</label>
-                                                <textarea id="accompanyingSymptoms" name="accompanyingSymptoms" class="styled-input edit_inputs textareas"
-                                                          style="width: auto;height: 140px ;border: 1px solid ;"
-                                                          th:text="${accompanyingSymptoms}" placeholder="伴随症状..." rows="1.9" cols="112" ></textarea>
-                                                <span class="status"></span>
-                                            </div>
-                                        </div>-->
                                     </div>
                                 </div>
                                 <div id="tab-23" class="tab-pane fade in active">
@@ -686,127 +346,6 @@
                                        </div>
                                   </div>
                                 </div>
-                                <!--<div id="tab-24" class="tab-pane fade in active">
-                                   <div class="panel-body">
-                                       <strong>患病史</strong>
-                                       <div class="customize-search-form">
-                                           <div class="customize-form-group edit">
-                                               <label>疾病史:</label>
-                                               <select name="medicalHistory" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_jibinshi')}">
-                                                   <option value="">请选择</option>
-                                                   <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                           th:selected="${dict.dictLabel}==${medicalHistory}"></option>
-                                               </select>
-                                           </div>
-                                           <div class="customize-form-group edit">
-                                               <label>疾病史描述:</label>
-                                               <input name="medicalHistoryDescription" placeholder="疾病史描述" class="styled-input edit_inputs" type="text"  th:value="${medicalHistoryDescription}">
-                                           </div>
-                                           <div class="customize-form-group edit">
-                                               <label>传染病史:</label>
-                                               <select name="infectiousDiseaseHistory" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_dtp_ysfw_crbs')}" >
-                                                   <option value="">请选择</option>
-                                                   <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                           th:selected="${dict.dictLabel}==${infectiousDiseaseHistory}"></option>
-                                               </select>
-                                           </div>
-                                           <div class="customize-form-group edit">
-                                               <label>传染病史描述:</label>
-                                               <input name="infectiousDiseaseHistoryDescription" placeholder="传染病史描述" class="styled-input edit_inputs" type="text"  th:value="${infectiousDiseaseHistoryDescription}">
-                                           </div>
-                                           <div class="customize-form-group edit">
-                                               <label>既往药物不良反应史:</label>
-                                               <input name="pastAdverseDrugReactionHistory" placeholder="既往药物不良反应史" class="styled-input edit_inputs" type="text"  th:value="${pastAdverseDrugReactionHistory}">
-                                           </div>
-                                           <div class="customize-form-group edit">
-                                                 <label>是否有手术外伤史:</label>
-                                                 <div class="input-groups" th:with="type=${@dict.getType('sys_yes_no')}">
-                                                 <input type="radio" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:checked="${dict.dictLabel}==${hasSurgicalTraumaHistory}"  name="hasSurgicalTraumaHistory" id="hasSurgicalTraumaHistory">
-                                           </div>
-                                       </div>
-                                       <div class="customize-search-form">
-                                           <div class="customize-form-group edit">
-                                               <div class="customize-form-group edit">
-                                                   <label>过敏史:</label>
-                                                   <textarea id="allergyHistory" name="allergyHistory" placeholder="这里可以输入过敏史..." class="styled-input edit_inputs textareas"
-                                                             style="width: auto;height: 140px ;border: 1px solid ;" rows="1.9" cols="112" th:text="${allergyHistory}"></textarea>
-                                               </div>
-                                           </div>
-                                       </div>
-                                     </div>
-                                       <div class="customize-search-form">
-                                           <div class="customize-form-group edit">
-                                               <div style="/*display: flex;*/">
-                                               <label style="width: auto;">家族史:</label>
-                                                   <button type="button"  data-toggle="modal" data-target="#myModal" class="btn btn-xs btn-primary">新增</button>
-                                                   <table id="familyHistoryTable" style="width: 340px;">
-                                                       <thead>
-                                                       <tr>
-                                                           <th>序号</th>
-                                                           <th>疾病</th>
-                                                           <th>家庭成员</th>
-                                                           <th>操作</th>
-                                                       </tr>
-                                                       </thead>
-                                                       <tbody id="familyHistoryTableBody">
-                                                       &lt;!&ndash; 表格行将在这里动态添加 &ndash;&gt;
-                                                       </tbody>
-                                                   </table>
-                                               </div>
-                                                   <div class="modal inmodal" id="myModal" tabindex="-1" role="dialog" aria-hidden="true">
-                                                       <div class="modal-dialog">
-                                                           <form class="form-horizontal" id="form-jzs-add">
-                                                               <div class="modal-content animated bounceInRight">
-                                                                   <div class="modal-header">
-                                                                       <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
-                                                                       </button>
-                                                                       <h4 class="modal-title">家族史</h4>
-                                                                   </div>
-                                                                   <div class="modal-body">
-                                                                       <div class="customize-search-form">
-                                                                           <div class="customize-form-group edit">
-                                                                                   <label >疾病</label>
-                                                                                   <input type="text" name="disease" placeholder="请输入疾病" class="styled-input edit_inputs"  style="width: 200px;" id="disease">
-                                                                            </div>
-                                                                       </div>
-                                                                       <div class="customize-search-form">
-                                                                           <div class="customize-form-group edit">
-                                                                               <label>家庭成员</label>
-                                                                               <select name="member" class="styled-input edit_inputs"  style="width: 200px;" th:with="type=${@dict.getType('sys_select_dtp_ysfw_lxryhzgx')}" id="member">
-                                                                                   <option value="">请选择家庭成员</option>
-                                                                                   <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                                                           th:selected="${dict.dictLabel}==${member}"></option>
-                                                                               </select>
-                                                                           </div>
-                                                                       </div>
-                                                                   </div>
-                                                                   <div class="modal-footer">
-                                                                       <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                                                       <button type="button" class="btn btn-primary" onclick="saveRow(1)">保存</button>
-                                                                   </div>
-                                                               </div>
-                                                           </form>
-                                                       </div>
-                                                   </div>
-                                           </div>
-                                       </div>
-                                   </div>
-                                </div>-->
-                                 <!--<div id="tab-25" class="tab-pane fade in active">
-                                     <div class="panel-body">
-                                         <strong>治疗手段</strong>
-                                         <div class="customize-search-form">
-                                             <div class="customize-form-group edit">
-                                                 <div style="/*display: flex;*/">
-                                                     <label style="width: auto;">多个治疗方案原因描述:</label>
-                                                     <textarea id="multipleTreatmentReasonsDescription" class="styled-input edit_inputs textareas" style="width: auto;height: 35px ;border: 1px solid ;"
-                                                               name="multipleTreatmentReasonsDescription" placeholder="治疗方案原因描述"
-                                                               rows="5" cols="185" th:text="${multipleTreatmentReasonsDescription}"></textarea>
-                                                 </div>
-                                             </div>
-                                         </div>
-                                     </div>
-                                 </div>-->
                                  <div id="tab-26" class="tab-pane fade in active">
                                      <div class="panel-body">
                                          <strong>用药情况 </strong>
@@ -867,87 +406,6 @@
                                          </div>
                                      </div>
                                  </div>
-                                 <!--<div id="tab-27" class="tab-pane fade in active">
-                                     <div class="panel-body">
-                                         <strong>其他信息</strong>
-                                         <div class="customize-search-form">
-                                             <div class="customize-form-group edit">
-                                                 <div style="/*display: flex;*/">
-                                                     <label style="width: auto;">联系人:</label>
-                                                     <button type="button"  data-toggle="modal" data-target="#myModal3" class="btn btn-xs btn-primary">新增</button>
-                                                     <table id="relationTable"  style="width: 310px;">
-                                                         <thead>
-                                                         <tr>
-                                                             <th>序号</th>
-                                                             <th>电话</th>
-                                                             <th>姓名</th>
-                                                             <th>关系</th>
-                                                             <th>操作</th>
-                                                         </tr>
-                                                         </thead>
-                                                         <tbody id="relationTableBody">
-                                                         &lt;!&ndash; 表格行将在这里动态添加 &ndash;&gt;
-                                                         </tbody>
-                                                     </table>
-                                                 </div>
-
-                                                 <div class="modal inmodal" id="myModal3" tabindex="-1" role="dialog" aria-hidden="true">
-                                                     <div class="modal-dialog">
-                                                         <form class="form-horizontal" id="form-relation-add">
-                                                             <div class="modal-content animated bounceInRight">
-                                                                 <div class="modal-header">
-                                                                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span>
-                                                                     </button>
-                                                                     <h4 class="modal-title">联系人</h4>
-                                                                 </div>
-                                                                 <div class="modal-body">
-                                                                     <div class="customize-search-form">
-                                                                         <div class="customize-form-group edit">
-                                                                             <label>联系人电话</label>
-                                                                             <div class="input-group">
-                                                                                 <input type="text" placeholder="请输入当联系人电话称"  class="styled-input isPhone" style="width: 200px;"  id="contact_phone" name="contact_phone" maxlength="11">
-                                                                             </div>
-                                                                         </div>
-                                                                     </div>
-                                                                     <div class="customize-search-form">
-                                                                         <div class="customize-form-group edit">
-                                                                             <label>联系人姓名</label>
-                                                                                 <div class="input-group">
-                                                                                     <input type="text" placeholder="请输入联系人姓名" class="styled-input edit_inputs"  style="width: 200px;" id="contact_name" name="contact_name">
-                                                                                 </div>
-                                                                         </div>
-                                                                     </div>
-                                                                     <div class="customize-search-form">
-                                                                         <div class="customize-form-group edit">
-                                                                             <label>联系人关系</label>
-                                                                             <select name="contact_relationship" class="styled-input edit_inputs"  style="width: 200px;" th:with="type=${@dict.getType('sys_select_dtp_ysfw_lxryhzgx')}" id="contact_relationship">
-                                                                                 <option value="">请选择联系人关系</option>
-                                                                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
-                                                                                         th:selected="${dict.dictLabel}==${contact_relationship}"></option>
-                                                                             </select>
-                                                                         </div>
-                                                                     </div>
-                                                                 </div>
-                                                                 <div class="modal-footer">
-                                                                     <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                                                                     <button type="button" class="btn btn-primary" onclick="saveRow(3)">保存</button>
-                                                                 </div>
-                                                             </div>
-                                                         </form>
-                                                     </div>
-                                                 </div>
-                                             </div>
-                                         </div>
-                                         <div class="customize-search-form">
-                                             <div class="customize-form-group edit">
-                                                 <label>陪护人:</label>
-                                                 <div class="input-groups" th:with="type=${@dict.getType('sys_select_dtp_ysfw_phr')}" id="caregiverDiv">
-                                                     <input type="checkbox" class="form-check-radio" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" name="caregiver">
-                                                 </div>
-                                             </div>
-                                         </div>
-                                     </div>
-                                 </div>-->
                              </form>
                        </div>
                             <div id="tab-3" class="tab-pane">
@@ -1073,8 +531,9 @@
 	<th:block th:include="include :: footer" />
     <th:block th:include="include :: select2-css" />
     <th:block th:include="include :: bootstrap-select-css" />
-</body>   <th:block th:include="include :: select2-js" />
+ <th:block th:include="include :: select2-js" />
 <th:block th:include="include :: bootstrap-select-js" />
+</body>
 </html>
 <script th:inline="javascript">
     var prefix = ctx + "dtp/pmService";
@@ -1097,112 +556,50 @@
             method: 'GET',
             dataType: 'json',
             success: function(data) {
-                var options1 = $('#category-select1');
-                var options2 = $('#category-select2');
-                var options3 = $('#category-select3');
-                var options4 = $('#category-select4');
-                var options5 = $('#category-select5');
-                var options6 = $('#category-select6');
-
+                // 获取所有的 select 元素
+                var selects = [
+                    $('#category-select1'),
+                    $('#category-select2'),
+                    $('#category-select3'),
+                    $('#category-select4'),
+                    $('#category-select5'),
+                    $('#category-select6')
+                ];
                 // 清空已有选项(除了第一个默认选项)
-                options1.find('option').not(':first').remove();
-                options2.find('option').not(':first').remove();
-                options3.find('option').not(':first').remove();
-                options4.find('option').not(':first').remove();
-                options5.find('option').not(':first').remove();
-                options6.find('option').not(':first').remove();
-
-                // 添加默认选项
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options1);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options2);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options3);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options4);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options5);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options6);
-                // 回显数据
+                selects.forEach(function(select) {
+                    select.find('option').not(':first').remove();
+                });
+                // 添加默认选项到每个下拉列表
+                selects.forEach(function(select) {
+                    if (!select.find('option:first').length) { // 检查是否已经有默认选项
+                        $('<option>', {
+                            value: '',
+                            text : '请选择疾病'
+                        }).prependTo(select); // 使用 prependTo 确保它成为第一个选项
+                    }
+                });
+                // 解析 dl 数据并获取 ID 数组
                 var dl = /*[[${dl}]]*/ '';
-                // 直接使用 dl 数据预填充下拉列表
                 var dlParsed = JSON.parse(dl);
-                if (Array.isArray(dlParsed)) {
-                    var dlIds = dlParsed.map(function (item) {
-                        return item.id;
-                    }); // 转换为 ID 数组
+                var dlIds = Array.isArray(dlParsed) ? dlParsed.map(item => item.id.toString()) : [];
                 // 遍历返回的数据并添加选项
-                $.each(data.value, function(index, item) {
-                    if(item.dict_key == 1){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options1);
-                        $(`#category-select1`).val(dlIds).trigger('change');
-                    }
-                    if(item.dict_key == 2){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options2);
-                        $(`#category-select2`).val(dlIds).trigger('change');
-                    }
-                    if(item.dict_key == 3){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options3);
-                        $(`#category-select3`).val(dlIds).trigger('change');
-
-                    }
-                    if(item.dict_key == 4){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options4);
-                        $(`#category-select4`).val(dlIds).trigger('change');
-                    }
-                    if(item.dict_key == 5){
+                $.each(data.value || [], function(index, item) {
+                    var selectIndex = item.dict_key-1; // 假设 dict_key 是从 1 开始的索引
+                    if (selectIndex >= 0 && selectIndex < selects.length) {
                         $('<option>', {
                             value: item.id,
                             text : item.categoryName
-                        }).appendTo(options5);
-                        $(`#category-select5`).val(dlIds).trigger('change');
-                    }
-                    if(item.dict_key == 6){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options6);
-                        $(`#category-select6`).val(dlIds).trigger('change');
+                        }).appendTo(selects[selectIndex]);
+                        // 设置选中的值(仅当 dlIds 包含该项 id 时)
+                        if (dlIds.includes(item.id.toString())) {
+                            selects[selectIndex].val(item.id).trigger('change');
+                        }
                     }
                 });
-
-                // 重新初始化 Select2 以反映新的选项
-                options1.trigger('change');
-                options2.trigger('change');
-                options3.trigger('change');
-                options4.trigger('change');
-                options5.trigger('change');
-                options6.trigger('change');
-
-
-        }
-
+                // 如果使用 Select2 插件,则初始化或刷新它们
+                selects.forEach(function(select) {
+                    select.trigger('change');
+                });
             },
             error: function(xhr, status, error) {
                 console.error("Failed to load disease categories:", error);

+ 42 - 105
health-admin/src/main/resources/templates/dtp/followUp/followUpEdit.html

@@ -710,10 +710,10 @@
 <th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 <th:block th:include="include :: ztree-js" />
 
-<th:block th:include="include :: select2-css" />
+<!--<th:block th:include="include :: select2-css" />
 <th:block th:include="include :: bootstrap-select-css" />
-</body>   <th:block th:include="include :: select2-js" />
-<th:block th:include="include :: bootstrap-select-js" />
+<th:block th:include="include :: select2-js" />
+<th:block th:include="include :: bootstrap-select-js" />-->
 </body>
 </html>
 
@@ -898,112 +898,49 @@
             method: 'GET',
             dataType: 'json',
             success: function(data) {
-                var options1 = $('#category-select1');
-                var options2 = $('#category-select2');
-                var options3 = $('#category-select3');
-                var options4 = $('#category-select4');
-                var options5 = $('#category-select5');
-                var options6 = $('#category-select6');
-
+                var selects = [
+                    $('#category-select1'),
+                    $('#category-select2'),
+                    $('#category-select3'),
+                    $('#category-select4'),
+                    $('#category-select5'),
+                    $('#category-select6')
+                ];
                 // 清空已有选项(除了第一个默认选项)
-                options1.find('option').not(':first').remove();
-                options2.find('option').not(':first').remove();
-                options3.find('option').not(':first').remove();
-                options4.find('option').not(':first').remove();
-                options5.find('option').not(':first').remove();
-                options6.find('option').not(':first').remove();
-
-                // 添加默认选项
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options1);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options2);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options3);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options4);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options5);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options6);
-                // 回显数据
+                selects.forEach(function(select) {
+                    select.find('option').not(':first').remove();
+                });
+                // 添加默认选项到每个下拉列表
+                selects.forEach(function(select) {
+                    if (!select.find('option:first').length) { // 检查是否已经有默认选项
+                        $('<option>', {
+                            value: '',
+                            text : '请选择疾病'
+                        }).prependTo(select); // 使用 prependTo 确保它成为第一个选项
+                    }
+                });
+                // 解析 dl 数据并获取 ID 数组
                 var dl = /*[[${dl}]]*/ '';
-                // 直接使用 dl 数据预填充下拉列表
                 var dlParsed = JSON.parse(dl);
-                if (Array.isArray(dlParsed)) {
-                    var dlIds = dlParsed.map(function (item) {
-                        return item.id;
-                    }); // 转换为 ID 数组
-                    // 遍历返回的数据并添加选项
-                    $.each(data.value, function(index, item) {
-                        if(item.dict_key == 1){
-                            $('<option>', {
-                                value: item.id,
-                                text : item.categoryName
-                            }).appendTo(options1);
-                            $(`#category-select1`).val(dlIds).trigger('change');
-                        }
-                        if(item.dict_key == 2){
-                            $('<option>', {
-                                value: item.id,
-                                text : item.categoryName
-                            }).appendTo(options2);
-                            $(`#category-select2`).val(dlIds).trigger('change');
-                        }
-                        if(item.dict_key == 3){
-                            $('<option>', {
-                                value: item.id,
-                                text : item.categoryName
-                            }).appendTo(options3);
-                            $(`#category-select3`).val(dlIds).trigger('change');
-
-                        }
-                        if(item.dict_key == 4){
-                            $('<option>', {
-                                value: item.id,
-                                text : item.categoryName
-                            }).appendTo(options4);
-                            $(`#category-select4`).val(dlIds).trigger('change');
-                        }
-                        if(item.dict_key == 5){
-                            $('<option>', {
-                                value: item.id,
-                                text : item.categoryName
-                            }).appendTo(options5);
-                            $(`#category-select5`).val(dlIds).trigger('change');
+                var dlIds = Array.isArray(dlParsed) ? dlParsed.map(item => item.id.toString()) : [];
+                // 遍历返回的数据并添加选项
+                $.each(data.value || [], function(index, item) {
+                    var selectIndex = item.dict_key-1; // 假设 dict_key 是从 1 开始的索引
+                    if (selectIndex >= 0 && selectIndex < selects.length) {
+                        $('<option>', {
+                            value: item.id,
+                            text : item.categoryName
+                        }).appendTo(selects[selectIndex]);
+                        // 设置选中的值(仅当 dlIds 包含该项 id 时)
+                        if (dlIds.includes(item.id.toString())) {
+                            selects[selectIndex].val(item.id).trigger('change');
                         }
-                        if(item.dict_key == 6){
-                            $('<option>', {
-                                value: item.id,
-                                text : item.categoryName
-                            }).appendTo(options6);
-                            $(`#category-select6`).val(dlIds).trigger('change');
-                        }
-                    });
-
-                    // 重新初始化 Select2 以反映新的选项
-                    options1.trigger('change');
-                    options2.trigger('change');
-                    options3.trigger('change');
-                    options4.trigger('change');
-                    options5.trigger('change');
-                    options6.trigger('change');
-
-
-                }
-
+                    }
+                });
+                // 如果使用 Select2 插件,则初始化或刷新它们
+                selects.forEach(function(select) {
+                    select.trigger('change');
+                });
             },
             error: function(xhr, status, error) {
                 console.error("Failed to load disease categories:", error);

+ 191 - 205
health-admin/src/main/resources/templates/dtp/recipe/edit.html

@@ -12,7 +12,8 @@
 
 <div class="col-sm-12 search-collapse">
     <div id="hzjdflag">
-        <a class="btn btn-info btn-rounded btn-sm" onclick="$.operate.addSetwht('添加患者信息','dtp/pmService/addArchivesCallback',800,800)">&nbsp;快速建档</a>
+        <a class="btn btn-info btn-rounded btn-sm" onclick="addArchivesCallback()">&nbsp;快速建档</a>
+        <!--<a class="btn btn-info btn-rounded btn-sm" onclick="$.operate.addSetwht('添加患者信息','dtp/pmService/addArchivesCallback',800,800)">&nbsp;快速建档</a>-->
         <!-- addArchivesCallback()提示信息<a class="btn btn-info btn-rounded btn-sm" onclick="$.operate.addSetwht('添加患者信息','dtp/pmService/addArchivesCallback',800,750)">&nbsp;快速建档</a> -->
         <span id="patientFlagMessage" style="display:none;" class="text-danger"></span>
     </div>
@@ -226,124 +227,126 @@
     </div>
 </div>
 
-    <div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
-        <div class="modal-dialog">
-                <div class="modal-content2 animated bounceInRight">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">关闭</span></button>
-                        <h2 class="modal-title">快速建档</h2>
-                    </div>
-                    <div class="modal-body">
-                            <form id="form-server-add">
-                                <div class="customize-form-group-container">
-                                        <label class="font-noraml">身份证上传</label>
-                                        <div class="new-contentarea tc">
-                                            <a href="javascript:void(0)" class="btn btn-xs btn-primary"><label for="inputImage" >上传图像</label> </a>
-                                            <input type="file" name="avatar" id="inputImage" onchange="uploadImage(this)" accept="image/*"/>
-                                        </div>
-                                        <div class="ibox2-title" style="align-items: center;">
-                                            <img id="uploadedImage" src="" style="max-width: 50%;display: block;margin-left: 21%;">
-                                        </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label is-required">姓名:</label>
-                                        <input name="name" id="name" placeholder="请输入姓名" class="styled-input" type="text" maxlength="30" required>
-                                        <input type="hidden" name="idCardImg" id="idCardImg" value="">
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label is-required">性别:</label>
-                                        <select name="gender" id="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}" required>
-                                            <option value="">请选择</option>
-                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                            ></option>
-                                        </select>
-                                    </div>
-                                    <div class="customize-form-group select-time">
-                                        <label class="col-sm-1 control-label">出生年月:</label>
-                                        <div class="input-group select-time">
-                                            <input name="dateBirth" placeholder="出生年月" class="time-input time-input2" type="text" id="dateBirth" disabled>
-                                        </div>
-                                    </div>
-                                    <div class="customize-form-group select-time">
-                                        <label class="col-sm-1 control-label">年龄:</label>
-                                        <div class="input-group select-time">
-                                            <input name="age" id="age" placeholder="年龄" class="styled-input" type="text" maxlength="30" disabled>
-                                        </div>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label is-required">联系方式:</label>
-                                        <input name="phoneNumber" id="phoneNumber" placeholder="请输入手机号" class="styled-input isPhone" type="text" maxlength="11"  required>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">联系人手机号:</label>
-                                        <input name="contactPhone" placeholder="请输入联系人手机号" class="styled-input isPhone" type="text" maxlength="11"  required>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">证件类型:</label>
-                                        <select name="documentType" id="documentType"  class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_ysfw_zjlx')}" required>
-                                            <option>请选择</option>
-                                            <option th:each="dict : ${type}" th:selected="${dict.dictLabel=='居民身份证'}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
-                                        </select>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">联系人姓名:</label>
-                                        <input name="contactName" placeholder="请输入联系人姓名" class="styled-input" type="text" maxlength="30"  required>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">证件号码:</label>
-                                        <input name="documentNumber" id="documentNumber" placeholder="请输入证件号码" class="styled-input" type="text" maxlength="30"  required>
-                                    </div>
-                                    <div class="customize-form-group edit select-time">
-                                        <label class="col-sm-1 control-label is-required">首次确诊时间:</label>
-                                        <input name="timeFirstDiagnosis" id="timeFirstDiagnosis" placeholder="首次确诊时间" class="time-input time-input2"  type="text" >
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">配送地址:</label>
-                                        <input name="addr" placeholder="配送地址"  id="addr" class="styled-input" type="text">
-                                    </div>
-
-
-
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">肿瘤发病部位疾病:</label>
-                                        <select id="category-select1"   class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
-                                        </select>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">肿瘤治疗并发症与合并症:</label>
-                                        <select id="category-select2" class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
-                                        </select>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">风湿免疫疾病名称:</label>
-                                        <select id="category-select3"   class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
-                                        </select>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">罕见病疾病:</label>
-                                        <select id="category-select4" class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
-                                        </select>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">感染类疾病:</label>
-                                        <select id="category-select5"   class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
-                                        </select>
-                                    </div>
-                                    <div class="customize-form-group">
-                                        <label class="col-sm-1 control-label">临时慢病:</label>
-                                        <select id="category-select6"   class="styled-input select2-multiple edit_inputs " multiple placeholder="请选择或输入搜索">
-                                        </select>
-                                    </div>
-                                 </div>
-                            </form>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
-                        <button type="button" class="btn btn-primary" onclick="submitArchives()">提交</button>
+<div class="modal inmodal fade" id="myModal2" tabindex="-1" role="dialog" >
+    <div class="modal-dialog modal-lg" style="width: 1000px">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                </button>
+                <h4 class="modal-title">快速建档</h4>
+                <!--<small class="font-bold">这里可以显示副标题。</small>-->
+            </div>
+            <div class="modal-body">
+                <form id="form-server-add">
+                    <div class="customize-form-group-container">
+                        <label class="font-noraml">身份证上传</label>
+                        <div class="new-contentarea tc">
+                            <a href="javascript:void(0)" class="btn btn-xs btn-primary"><label for="inputImage" >上传图像</label> </a>
+                            <input type="file" name="avatar" id="inputImage" onchange="uploadImage(this)" accept="image/*"/>
+                        </div>
+                        <div class="ibox2-title" style="align-items: center;">
+                            <img id="uploadedImage" src="" style="max-width: 50%;display: block;margin-left: 21%;">
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label is-required">姓名:</label>
+                            <input name="name" id="name" placeholder="请输入姓名" class="styled-input" type="text" maxlength="30" required>
+                            <input type="hidden" name="idCardImg" id="idCardImg" value="">
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label is-required">性别:</label>
+                            <select name="gender" id="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}" required>
+                                <option value="">请选择</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                ></option>
+                            </select>
+                        </div>
+                        <div class="customize-form-group select-time">
+                            <label class="col-sm-1 control-label">出生年月:</label>
+                            <div class="input-group select-time">
+                                <input name="dateBirth" placeholder="出生年月" class="time-input time-input2" type="text" id="dateBirth" disabled>
+                            </div>
+                        </div>
+                        <div class="customize-form-group select-time">
+                            <label class="col-sm-1 control-label">年龄:</label>
+                            <div class="input-group select-time">
+                                <input name="age" id="age" placeholder="年龄" class="styled-input" type="text" maxlength="30" disabled>
+                            </div>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label is-required">联系方式:</label>
+                            <input name="phoneNumber" id="phoneNumber" placeholder="请输入手机号" class="styled-input isPhone" type="text" maxlength="11"  required>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">联系人手机号:</label>
+                            <input name="contactPhone" placeholder="请输入联系人手机号" class="styled-input isPhone" type="text" maxlength="11"  required>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">证件类型:</label>
+                            <select name="documentType" id="documentType"  class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_ysfw_zjlx')}" required>
+                                <option>请选择</option>
+                                <option th:each="dict : ${type}" th:selected="${dict.dictLabel=='居民身份证'}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">联系人姓名:</label>
+                            <input name="contactName" placeholder="请输入联系人姓名" class="styled-input" type="text" maxlength="30"  required>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">证件号码:</label>
+                            <input name="documentNumber" id="documentNumber" placeholder="请输入证件号码" class="styled-input" type="text" maxlength="30"  required>
+                        </div>
+                        <div class="customize-form-group edit select-time">
+                            <label class="col-sm-1 control-label is-required">首次确诊时间:</label>
+                            <input name="timeFirstDiagnosis" id="timeFirstDiagnosis" placeholder="首次确诊时间" class="time-input time-input2"  type="text" >
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">配送地址:</label>
+                            <input name="addr" placeholder="配送地址"  id="addr" class="styled-input" type="text">
+                        </div>
+
+
+
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">肿瘤发病部位疾病:</label>
+                            <select id="category-select1"   class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">肿瘤治疗并发症与合并症:</label>
+                            <select id="category-select2" class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">风湿免疫疾病名称:</label>
+                            <select id="category-select3"   class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">罕见病疾病:</label>
+                            <select id="category-select4" class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">感染类疾病:</label>
+                            <select id="category-select5"   class="styled-input select2-multiple edit_inputs" multiple placeholder="请选择或输入搜索">
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label class="col-sm-1 control-label">临时慢病:</label>
+                            <select id="category-select6"   class="styled-input select2-multiple edit_inputs " multiple placeholder="请选择或输入搜索">
+                            </select>
+                        </div>
                     </div>
-                </div>
+                </form>
+            </div>
 
+            <div class="modal-footer">
+                <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" onclick="submitArchives()">保存</button>
+            </div>
         </div>
     </div>
+</div>
 
 
 <div class="main-content">
@@ -1209,6 +1212,11 @@
                 packingValue: $(row).find('input[name="packingValue"]').val(),
                 packingUnit: $(row).find('input[name="packingUnit"]').val(),
             };
+            if (rowData.dosageFrequencyDays == ''|| rowData.dosageFrequencyDays == null|| rowData.dosageFrequencyDays == undefined){
+                $.modal.alertError("购药包装单位为空,请到药品库设置包装单位后再操作");
+                falg = false;
+                return falg;
+            }
             if (rowData.packageQuantity == '' || rowData.packageQuantity == null || rowData.packageQuantity == undefined) {
                 $.modal.alertError("请输入包装数量");
                 falg = false;
@@ -1292,6 +1300,8 @@
         }
         formData.append('age',  $('#age1').val());
         formData.append('gender',  $('#gender1').val());
+        formData.append('patientPhone',  $('#patientPhone').val());
+        formData.append('patientName',  $('#patientName').val());
         // prescriptionImageUpload 处方
         let prescriptionImageUpload = document.getElementById('prescriptionImageUpload');
         //invoiceImageUpload 发票
@@ -1636,7 +1646,7 @@
                             <option value="5">每周2次</option>-->
                         </select>
                     </td>
-                    <td> <input name="dosageFrequencyDays" id="dosageFrequencyDays${columnsData.productId}" placeholder="购药包装单位" class="styled-input" style="width: 100px;" type="number"><span id="ycode${columnsData.productId}"></span></td>
+                    <td> <input name="dosageFrequencyDays" id="dosageFrequencyDays${columnsData.productId}" placeholder="购药包装单位" class="styled-input"  disabled style="width: 100px;" type="number"><span id="ycode${columnsData.productId}"></span></td>
                     <td> <input name="dvalueDays" id="dvalueDays${columnsData.productId}" placeholder="系统自动计算" class="styled-input" disabled="" style="width: 80px;" type="number"></td>
                 </tr>
             `;
@@ -1724,7 +1734,9 @@
 
 
     function bookbuilding(){
-        $.operate.addSetwht('快速建档', prefix_pmService + '/archivesAdd',800,800)
+        loadAchievs();
+        $('#myModal2').modal('show');
+        //$.operate.addSetwht('快速建档', prefix_pmService + '/archivesAdd',800,800)
     }
     function resetPre() {
         resetDate();
@@ -1934,7 +1946,7 @@
                             <option value="5">每周2次</option>-->
                         </select>
                     </td>
-                    <td> <input name="dosageFrequencyDays" value="${columnsData.packingValue}" id="dosageFrequencyDays${columnsData.productId}" placeholder="购药包装单位" class="styled-input" style="width: 100px;" type="number"><span id="ycode${columnsData.productId}"></span></td>
+                    <td> <input name="dosageFrequencyDays" value="${columnsData.packingValue}" id="dosageFrequencyDays${columnsData.productId}" placeholder="购药包装单位" class="styled-input" disabled style="width: 100px;" type="number"><span id="ycode${columnsData.productId}"></span></td>
                     <td> <input name="dvalueDays" id="dvalueDays${columnsData.productId}" placeholder="系统自动计算" class="styled-input" disabled="" style="width: 80px;" type="number"><span id="defaultNum${columnsData.productId}" style="color: red"></span></td>
                 </tr>
             `;
@@ -2002,90 +2014,52 @@
             method: 'GET',
             dataType: 'json',
             success: function(data) {
-                var options1 = $('#category-select1');
-                var options2 = $('#category-select2');
-                var options3 = $('#category-select3');
-                var options4 = $('#category-select4');
-                var options5 = $('#category-select5');
-                var options6 = $('#category-select6');
+                // 获取所有的 select 元素
+                var selects = [
+                    $('#category-select1'),
+                    $('#category-select2'),
+                    $('#category-select3'),
+                    $('#category-select4'),
+                    $('#category-select5'),
+                    $('#category-select6')
+                ];
                 // 清空已有选项(除了第一个默认选项)
-                options1.find('option').not(':first').remove();
-                options2.find('option').not(':first').remove();
-                options3.find('option').not(':first').remove();
-                options4.find('option').not(':first').remove();
-                options5.find('option').not(':first').remove();
-                options6.find('option').not(':first').remove();
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options1);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options2);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options3);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options4);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options5);
-                $('<option>', {
-                    value: '',
-                    text : '请选择疾病'
-                }).appendTo(options6);
-                // 遍历返回的数据并添加选项
-                $.each(data.value, function(index, item) {
-                    if(item.dict_key==1){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options1);
-                    }
-                    if(item.dict_key==2){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options2);
-                    }
-                    if(item.dict_key==3){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options3);
-                    }
-                    if(item.dict_key==4){
+                selects.forEach(function(select) {
+                    select.find('option').not(':first').remove();
+                });
+                // 添加默认选项到每个下拉列表
+                selects.forEach(function(select) {
+                    if (!select.find('option:first').length) { // 检查是否已经有默认选项
                         $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options4);
+                            value: '',
+                            text : '请选择疾病'
+                        }).prependTo(select); // 使用 prependTo 确保它成为第一个选项
                     }
-                    if(item.dict_key==5){
-                        $('<option>', {
-                            value: item.id,
-                            text : item.categoryName
-                        }).appendTo(options5);
-                    }
-                    if(item.dict_key==6){
+                });
+                // 解析 dl 数据并获取 ID 数组
+                /*<![CDATA[*/
+                var dl = /*[[${dl}]]*/ '';
+                /*]]>*/
+                var dlParsed = JSON.parse(dl);
+                var dlIds = Array.isArray(dlParsed) ? dlParsed.map(item => item.id.toString()) : [];
+                // 遍历返回的数据并添加选项
+                $.each(data.value || [], function(index, item) {
+                    var selectIndex = item.dict_key-1; // 假设 dict_key 是从 1 开始的索引
+                    if (selectIndex >= 0 && selectIndex < selects.length) {
                         $('<option>', {
                             value: item.id,
                             text : item.categoryName
-                        }).appendTo(options6);
+                        }).appendTo(selects[selectIndex]);
+                        // 设置选中的值(仅当 dlIds 包含该项 id 时)
+                        if (dlIds.includes(item.id.toString())) {
+                            selects[selectIndex].val(item.id).trigger('change');
+                        }
                     }
                 });
-
-                // 重新初始化 Select2 以反映新的选项
-                options1.trigger('change');
-                options2.trigger('change');
-                options3.trigger('change');
-                options4.trigger('change');
-                options5.trigger('change');
-                options6.trigger('change');
+                // 如果使用 Select2 插件,则初始化或刷新它们
+                selects.forEach(function(select) {
+                    select.trigger('change');
+                });
             },
             error: function(xhr, status, error) {
                 $.modal.alertError("解析疾病失败");
@@ -2100,28 +2074,28 @@
         if(documentType=="居民身份证") {
             var IDCard= $("#documentNumber").val();
             if (IDCard == null || IDCard == "" || IDCard == undefined){
-                $.modal.alert("请输入身份证号码")
-                return false
+                $.modal.alertError("请输入身份证号码")
+                return;
             }
             if (validateIDCard(IDCard)==false) {
-                $.modal.alert("身份证号码格式不正确,请重新输入!")
-                return false
+                $.modal.alertError("身份证号码格式不正确,请重新输入!")
+                return;
             }
         }
         var gender= $("#gender").val()
         if (gender==null || gender=="" || gender==undefined) {
-            $.modal.alert("请选择性别")
-            return false
+            $.modal.alertError("请选择性别")
+            return ;
         }
         var timeFirstDiagnosis= $("#timeFirstDiagnosis").val();
         if (timeFirstDiagnosis==null || timeFirstDiagnosis=="" || timeFirstDiagnosis==undefined) {
-            $.modal.alert("请选择首次确诊时间")
-            return false
+            $.modal.alertError("请选择首次确诊时间")
+            return ;
         }
         var phoneNumber= $("#phoneNumber").val()
         if (phoneNumber==null || phoneNumber=="" || phoneNumber==undefined) {
             $.modal.alert("请输入联系方式")
-            return false
+            return ;
         }
 
         add();
@@ -2147,7 +2121,7 @@
             hasSelection = true;
         }
 
-        const DL = JSON.stringify(selectedDataDL);
+        var DL = JSON.stringify(selectedDataDL);
         if (!hasSelection) {
             $.modal.alert('请至少选择一个疾病选项!');
             return;
@@ -2158,13 +2132,19 @@
         $.ajax({
             cache : true,
             type : "POST",
-            url : ctx + "dtp/pmService/addArchivesCallback",
+            url : ctx + "dtp/pmService/archivesAdd",
             data : data,
             async : false,
             error : function(request) {
                 $.modal.alertError("系统错误");
             },
             success : function(responseData) {
+                $('#patientPhone').val($("#phoneNumber").val())
+                $('#patientName').val($("#name").val());
+                $('#age1').val($("#age").val());
+                $('#gender1').val($("#gender").val());
+                $('#patientFlagMessage').hide();
+                patientFlag = true;
                 $('#myModal2').modal('hide'); // 关闭弹窗
             }
         });
@@ -2287,7 +2267,13 @@
     }
 </script>
 <style>
+    .modal.inmodal {
+        z-index: 1050; /* 确保模态框有一个较高的z-index */
+    }
 
+    .select2-dropdown {
+        z-index: 9999 !important; /* 强制提高select2下拉菜单的z-index */
+    }
     .ibox {
         width: auto;
         height: 370px;

+ 10 - 5
health-admin/src/main/resources/templates/dtp/recipe/newRecipe.html

@@ -911,6 +911,10 @@ function initTab(datas){
                 dosageFrequencyDays: $(row).find('input[name="dosageFrequencyDays"]').val(),
                 dvalueDays: $(row).find('input[name="dvalueDays"]').val()
             };
+            if (rowData.dosageFrequencyDays == ''|| rowData.dosageFrequencyDays == null|| rowData.dosageFrequencyDays == undefined){
+                $.modal.alertError("购药包装单位为空,请到药品库设置包装单位后再操作");
+                return;
+            }
             if (rowData.packageQuantity == ''|| rowData.packageQuantity == null|| rowData.packageQuantity == undefined){
                 $.modal.alertError("请输入包装数量");
                 return;
@@ -927,10 +931,6 @@ function initTab(datas){
                 $.modal.alertError("请输入频次");
                 return;
             }
-            /*if (rowData.dosageFrequencyDays == ''|| rowData.dosageFrequencyDays == null|| rowData.dosageFrequencyDays == undefined){
-                $.modal.alertError("请输入频次换算使用天数");
-                return;
-            }*/
             // 将每一行的数据对象添加到数组中
             tableRows.push(rowData);
         });
@@ -1062,6 +1062,11 @@ function initTab(datas){
                 packingValue: $(row).find('input[name="packingValue"]').val(),
                 packingUnit: $(row).find('input[name="packingUnit"]').val(),
             };
+            if (rowData.dosageFrequencyDays == ''|| rowData.dosageFrequencyDays == null|| rowData.dosageFrequencyDays == undefined){
+                $.modal.alertError("购药包装单位为空,请到药品库设置包装单位后再操作");
+                falg = false;
+                return falg;
+            }
             if (rowData.packageQuantity == ''|| rowData.packageQuantity == null|| rowData.packageQuantity == undefined){
                 $.modal.alertError("请输入包装数量");
                 falg = false;
@@ -1459,7 +1464,7 @@ function initTab(datas){
                             <option value="5">每周2次</option>-->
                         </select>
                     </td>
-                    <td> <input name="dosageFrequencyDays" id="dosageFrequencyDays${columnsData.productId}" placeholder="购药包装单位" class="styled-input" style="width: 100px;" type="number"><span id="ycode${columnsData.productId}"></span></td>
+                    <td> <input name="dosageFrequencyDays" id="dosageFrequencyDays${columnsData.productId}" placeholder="购药包装单位" class="styled-input" disabled style="width: 100px;" type="number"><span id="ycode${columnsData.productId}"></span></td>
                     <td> <input name="dvalueDays" id="dvalueDays${columnsData.productId}" placeholder="系统自动计算" class="styled-input" disabled="" style="width: 100px;" type="number"></td>
                 </tr>
             `;

+ 10 - 10
health-admin/src/main/resources/templates/spgl/SPProductEdit.html

@@ -17,7 +17,7 @@
             <ul class="nav nav-tabs" id="myTabs3">
                 <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true"> 基本信息</a>
                 </li>
-                <li class=""><a data-toggle="tab" href="#tab-12" aria-expanded="false">DTP属性</a>
+                <li class=""><a data-toggle="tab" href="#tab-12" aria-expanded="false">D值配置属性</a>
                 </li>
                 <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">采购属性</a>
                 </li>
@@ -32,14 +32,14 @@
                 <li class=""><a data-toggle="tab" href="#tab-7" aria-expanded="false">图片属性</a>
                 </li>
                 <!-- 下面再看 先把上面的弄完-->
-                <li class=""><a data-toggle="tab" href="#tab-8" aria-expanded="false">处方属性</a>
+                <!--<li class=""><a data-toggle="tab" href="#tab-8" aria-expanded="false">处方属性</a>
                 </li>
                 <li class=""><a data-toggle="tab" href="#tab-9" aria-expanded="false">D值配置属性</a>
                 </li>
                 <li class=""><a data-toggle="tab" href="#tab-10" aria-expanded="false">说明书属性</a>
                 </li>
                 <li class=""><a data-toggle="tab" href="#tab-11" aria-expanded="false">知识库属性</a>
-                </li>
+                </li>-->
 
             </ul>
             <div class="tab-content">
@@ -1317,7 +1317,7 @@
                         <!-- 参考零售价 -->
                         <div class="customize-form-group edit">
                             <label>参考零售价:</label>
-                            <input type="number" name="reference_retail_price" class="styled-input edit_inputs" step="0.01" th:value="${reference_retail_price}" />
+                            <input type="number" name="reference_retail_price" class="styled-input edit_inputs" step="0.01" th:value="${reference_retail_price}" required/>
                             <span class="span_line" readonly></span>
                         </div>
 
@@ -1498,7 +1498,7 @@
                         <!-- 平台属性 -->
                         <div class="customize-form-group edit">
                             <label>平台属性:</label>
-                            <input type="text" name="platform_property" class="styled-input edit_inputs" th:value="${platform_property}" />
+                            <input type="text" name="platform_property" class="styled-input edit_inputs" th:value="${platform_property}" required/>
                             <span class="span_line" readonly></span>
                         </div>
 
@@ -1677,11 +1677,11 @@
             'approval_number_1': "请先填写【质管属性】批准文号1!",
             'reference_retail_price': "请先填写【销售属性】参考零售价!",
             'platform_property': "请先填写【业态属性】平台属性!",
-            'follow_up_item': "请选择是【DTP属性】否随访品!",
-            'cold_chain_item': "请选择【DTP属性】是否冷链品!",
-            'registered_item': "请选择【DTP属性】是否登记品!",
-            'flow_item': "请选择【DTP属性】是否流向品!",
-            'prescription_required': "请选择【DTP属性】是否凭处方销售!"
+            'follow_up_item': "请选择是【D值配置属性】否随访品!",
+            'cold_chain_item': "请选择【D值配置属性】是否冷链品!",
+            'registered_item': "请选择【D值配置属性】是否登记品!",
+            'flow_item': "请选择【D值配置属性】是否流向品!",
+            'prescription_required': "请选择【D值配置属性】是否凭处方销售!"
         };
 
         // 验证必填字段

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

@@ -820,7 +820,13 @@ public class DTPService {
                     }else if(gender.equals("女")){
                         pd.put("gender", "1");
                     }else {
-                        pd.put("gender", "3");
+                        if (gender.equals("0")){
+                            pd.put("gender", "0");
+                        }else if(gender.equals("1")){
+                            pd.put("gender", "1");
+                        }else {
+                            pd.put("gender", "3");
+                        }
                     }
                 }
             if (StringUtils.isNull(pd.get("registrant"))){