Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java

@@ -223,7 +223,7 @@ public class PatientInformationController {
             return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
         }
 
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"病人信息"}));
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"}));
     }
 
     /**
@@ -249,11 +249,7 @@ public class PatientInformationController {
         Page<PatientInformationDto> patientInformationPage = new Page<>(pageNo, pageSize, total);
         patientInformationPage.setRecords(listPatients);
 
-        if (patientInformationPage == null || patientInformationPage.getRecords().isEmpty()) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null));
-        }
-        return R.ok(patientInformationPage,
-            MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"病人信息"}));
+        return R.ok(patientInformationPage);
     }
 
 }

openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml

@@ -42,12 +42,25 @@
         <where>
             <!-- 如果传入busNo参数，且不为空 -->
             <if test="busNo != null and busNo != ''">
-                AND busNo LIKE CONCAT(#{busNo}, '%')
+                AND pt.bus_no LIKE CONCAT('%',#{busNo}, '%')
             </if>
 
             <!-- 如果传入name参数，且不为空 -->
             <if test="name != null and name != ''">
-                AND name LIKE CONCAT(#{name}, '%')
+                <choose>
+                    <!-- 如果name参数中包含汉字 -->
+                    <when test="name.matches('.*[\u4e00-\u9fa5].*')">
+                        AND pt.name LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中只包含字母 -->
+                    <when test="name.matches('^[a-zA-Z]+$')">
+                        AND pt.py_str LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中既包含汉字又包含字母 -->
+                    <otherwise>
+                        AND (pt.name LIKE CONCAT('%', #{name}, '%') OR pt.py_str LIKE CONCAT('%', #{name}, '%'))
+                    </otherwise>
+                </choose>
             </if>
         </where>
         ORDER BY pt.bus_no
@@ -62,12 +75,25 @@
         <where>
             <!-- 如果传入busNo参数，且不为空 -->
             <if test="busNo != null and busNo != ''">
-                AND busNo LIKE CONCAT(#{busNo}, '%')
+                AND pt.bus_no LIKE CONCAT('%',#{busNo}, '%')
             </if>
 
             <!-- 如果传入name参数，且不为空 -->
             <if test="name != null and name != ''">
-                AND name LIKE CONCAT(#{name}, '%')
+                <choose>
+                    <!-- 如果name参数中包含汉字 -->
+                    <when test="name.matches('.*[\u4e00-\u9fa5].*')">
+                        AND pt.name LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中只包含字母 -->
+                    <when test="name.matches('^[a-zA-Z]+$')">
+                        AND pt.py_str LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中既包含汉字又包含字母 -->
+                    <otherwise>
+                        AND (pt.name LIKE CONCAT('%', #{name}, '%') OR pt.py_str LIKE CONCAT('%', #{name}, '%'))
+                    </otherwise>
+                </choose>
             </if>
         </where>
     </select>

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java

@@ -110,7 +110,7 @@ public class Patient extends HisBaseEntity {
     private String linkName;
 
     /** 联系人关系 */
-    private Integer linkRelationCode;
+    private FamilyRelationshipType linkRelationCode;
 
     /** 联系人电话 */
     private String linkTelcom;

openhis-ui-vue3/src/views/patientManagement/patientManagement/component/api.js

@@ -62,4 +62,13 @@ export function listPatient(query) {
     })
   }
 
+  // 修改
+export function updatePatient(data) {
+    return request({
+      url: '/patientmanage/information/patient-information',
+      method: 'put',
+      data: data
+    })
+  }
+
 

openhis-ui-vue3/src/views/patientManagement/patientManagement/index.vue

@@ -79,7 +79,7 @@
 					  <el-col :span="8">
 						<el-form-item label="性别" prop="genderEnum">
 						   <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
-								<el-radio v-for="item in administrativegenderList" :key="item.value" :label="item.value" >
+								<el-radio v-for="item in administrativegenderList" :key="item.value" :label="item.value"  @change="radiochange">
 									{{ item.info }}
 								</el-radio>
 						   </el-radio-group>
@@ -223,10 +223,8 @@
 <script  setup name="patientManagement">
 import pcas from 'china-division/dist/pcas-code.json';
 import { ref, computed } from 'vue';
-import familyRelationships from "./component/familyRelationships"
 import {listmaritalstatus,listoccupationtype,lisadministrativegender,listbloodtypeabo,listbloodtypearh,listfamilyrelationshiptype,
-	addPatient,listPatient} from "./component/api"
-import { RegionFullGroup  } from 'v-region'
+	addPatient,listPatient,updatePatient} from "./component/api"
 
 const showSearch = ref(true);
 const open = ref(false);
@@ -306,6 +304,7 @@ function getList() {
   });
   lisadministrativegender().then(response => {
 	administrativegenderList.value = response.data
+	console.log("administrativegenderList.value",administrativegenderList.value)
   });
   listbloodtypeabo().then(response => {
 	bloodtypeaboList.value = response.data
@@ -325,7 +324,7 @@ function reset() {
     nameJson: undefined,
     menuName: undefined,
     age: undefined,
-    genderEnum: undefined,
+    genderEnum: 0,
     idType: undefined,
 	idCard: undefined,
 	phone: undefined,
@@ -384,6 +383,7 @@ function handleUpdate(row) {
   const codes = convertAddressToCodes(selectedOptions1.value);
   selectedOptions.value = codes.filter(code => code !== null);
   isViewMode.value = false;
+  console.log("form.value12",form.value)
   open.value = true;
   title.value = "修改菜单";
 }
@@ -414,12 +414,16 @@ function cancel() {
   open.value = false;
   reset();
 }
+function radiochange(){
+	console.log("form.value.eadio",form.value.genderEnum)
+}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["patientRef"].validate(valid => {
     if (valid) {
       if (form.value.busNo != undefined) {
-        updateMenu(form.value).then(response => {
+		console.log("form.value.up",form.value)
+        updatePatient(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();

openhis-ui-vue3/vite.config.js

@@ -32,6 +32,7 @@ export default defineConfig (({mode, command}) => {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
           target: 'http://localhost:18080/openhis',
+          // target: 'http://192.168.31.221:18080/openhis',
           changeOrigin: true,
           rewrite: p => p.replace (/^\/dev-api/, ''),
         },