--

src/views/hospitalization/zhu-yuan-yi-sheng/maternal-child/EarlyPregnancyRegistration.vue

@@ -20,7 +20,16 @@ const error = ref("");
 const loading = ref(false);
 
 async function fuYouRequest11() {
-    let res = await fuYouRequest();
+    let a = {
+        "source":"womanMain",
+                "remark":"孕妇建卡",
+                "operate":"get",
+                "data":
+        {
+            "cardNo": '332526199303195328'
+        }
+    }
+    let res = await fuYouRequest(JSON.stringify(a));
     console.log("getData=============", res);
 }
 </script>

src/views/hospitalization/zhu-yuan-yi-sheng/maternal-child/IntrapartumManagement.vue

@@ -1026,12 +1026,12 @@ import {parseTime} from "@/utils/index.js";
 import {Search} from "@element-plus/icons-vue";
 import {getTemplateContentById} from "@/api/dictionary/diagnoseToJyJcReq";
 import {useVModels} from "@vueuse/core/index";
-import {ElMessage, ElMessageBox} from "element-plus";
+import {ElMessage, ElMessageBox, FormRules} from "element-plus";
 import router from "@/router";
 import {FYSystemUrl} from "@/config";
 import {huanZheXinXi} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import {getCurrentTimeMillis} from "@/api/public-api";
-import { useUserStore }  from "@/pinia/user-store"
+import {useUserStore} from "@/pinia/user-store"
 
 const props = defineProps({
     patData: Object
@@ -2292,20 +2292,10 @@ const deliveryPlaceOptions = ref([
 ])
 const rules = reactive<FormRules<deliveryData>>({
     name: [
-        {required: true, message: 'Please input Activity name', trigger: 'blur'},
+        {required: true, message: '请选择患者', trigger: 'blur'},
     ]
 
 });
-const handleComplicationsOtherConfirm = () => {
-    console.log('complicationsOtherList-------111------', complicationsOtherList.value)
-    if (complicationsOtherList.length === 0) {
-        return false
-    }
-    let complicationsOtherCheckedList = complicationsOtherOptions.value.filter(i => complicationsOtherList.value.indexOf(i.value) !== -1).map(i => i.label);
-    complicationsOtherStr.value = complicationsOtherCheckedList.join(",")
-    deliveryData.value.complicationsOther = complicationsOtherList.value.join(",")
-    complicationsOtherDialogVisible.value = false
-}
 
 const submitIntrapartumManagement = async (formEl: FormInstance | undefined) => {
     if (!formEl) return
@@ -2317,14 +2307,39 @@ const submitIntrapartumManagement = async (formEl: FormInstance | undefined) =>
     })
     //新增
     if (!deliveryData.value.sysId) {
+        if (!useUserStore().userInfo?.name || !useUserStore().userInfo?.socialNo) {
+            ElMessage({
+                type: "warning",
+                title: "提示",
+                duration: 4000,
+                dangerouslyUseHTMLString: true,
+                message: "当前登录医生姓名或身份证获取失败！",
+                showClose: true,
+            });
+            return
+        }
         deliveryData.value.sysId = generateGUID()
         deliveryData.value.uploadTime = parseTime(await getCurrentTimeMillis(), '{y}-{m}-{d} {h}:{i}:{s}')
         deliveryData.value.doctorCode = useUserStore().userInfo?.socialNo ? useUserStore().userInfo?.socialNo : ''
+        deliveryData.value.doctor = useUserStore().userInfo?.name ? useUserStore().userInfo?.name : ''
+        deliveryData.value.inputDoctorCode = useUserStore().userInfo?.socialNo ? useUserStore().userInfo?.socialNo : ''
+        deliveryData.value.inputDoctor = useUserStore().userInfo?.name ? useUserStore().userInfo?.name : ''
     }
     console.log('submitIntrapartumManagement-------------', deliveryData.value)
 
 }
 
+const handleComplicationsOtherConfirm = () => {
+    console.log('complicationsOtherList-------111------', complicationsOtherList.value)
+    if (complicationsOtherList.length === 0) {
+        return false
+    }
+    let complicationsOtherCheckedList = complicationsOtherOptions.value.filter(i => complicationsOtherList.value.indexOf(i.value) !== -1).map(i => i.label);
+    complicationsOtherStr.value = complicationsOtherCheckedList.join(",")
+    deliveryData.value.complicationsOther = complicationsOtherList.value.join(",")
+    complicationsOtherDialogVisible.value = false
+}
+
 const resetDeliveryForm = (formEl: FormInstance | undefined) => {
     if (!formEl) return
     formEl.resetFields()

src/views/hospitalization/zhu-yuan-yi-sheng/maternal-child/MaternalChildHome.vue

@@ -235,96 +235,96 @@ const queryPatientRegistrationInfo = () => {
                     "cardNo": huanZheXinXi.value.socialNo
                 }
     }
-    // // 开发待删除
-    // fuYouInfo.value = {
-    //     "expectedAge": 20,
-    //         "tbKey": "0",
-    //         "occupation": "998",
-    //         "education": "70",
-    //         "restCity": "宿迁市",
-    //         "nation": "01",
-    //         "county": "沭阳县",
-    //         "cardNo": "321322200601023686",
-    //         "lmp": 1747584000000,
-    //         "gravidity": 1,
-    //         "manTeamNo": "时庄",
-    //         "restAddrCode": "321322136010",
-    //         "manNot": "0",
-    //         "manTeam": "1号",
-    //         "gestDays": 2,
-    //         "tel": "18964749402",
-    //         "manCardType": "01",
-    //         "workOrgan": "无",
-    //         "manProv": "江苏省",
-    //         "inputOrgan": "沭阳十字医院",
-    //         "town": "十字街道",
-    //         "updateOrgan": "沭阳十字医院",
-    //         "manCardNo": "321322199804251237",
-    //         "inputDate": 1752654535000,
-    //         "dbKey": "0",
-    //         "manWorkOrgan": "无",
-    //         "restTeamNo": "时庄组",
-    //         "addrCode": "321322136010",
-    //         "restTeam": "1号",
-    //         "nationality": "CN",
-    //         "domicileAddr": "江苏省沭阳县龙庙镇聂湾村直属组37号",
-    //         "checkPeriod": "1",
-    //         "gestWeeks": 8,
-    //         "name": "章舟月",
-    //         "doctorCode": "320823198102020627",
-    //         "manAddrCode": "321322136010",
-    //         "restProv": "江苏省",
-    //         "manOccupation": "998",
-    //         "manDomicileAddr": "江苏省沭阳县沭城镇学宜居委会时庄组1号",
-    //         "organ": "沭阳县十字街道学宜居委会",
-    //         "healthNo": "3213222503902",
-    //         "birthday": 1136131200000,
-    //         "updateDate": 1757403531000,
-    //         "inputDoctorCode": "320823198102020627",
-    //         "manBirthday": 893437200000,
-    //         "sysId": "437fcb4d-5890-42c3-931a-009908696d7b",
-    //         "manName": "乔勇翔",
-    //         "updateDoctorCode": "320823198102020627",
-    //         "city": "宿迁市",
-    //         "parity": 0,
-    //         "updateDoctor": "冯秀芹",
-    //         "manNation": "01",
-    //         "domicileType": "1",
-    //         "faceMum": "47f54be0-e310-4ae3-86bf-ca563b793adf",
-    //         "expectedDate": 1771776000000,
-    //         "manCounty": "沭阳县",
-    //         "manAge": 27,
-    //         "manTown": "十字街道",
-    //         "teamNo": "时庄组",
-    //         "inputDoctor": "冯秀芹",
-    //         "marriage": "20",
-    //         "organCode": "32000000353057",
-    //         "manNationality": "CN",
-    //         "faceDady": "1b52b83a-11fd-4be3-a9fd-d44175a78f7a",
-    //         "village": "学宜",
-    //         "prov": "江苏省",
-    //         "manCity": "宿迁市",
-    //         "recordOrgan": "沭阳十字医院",
-    //         "restTown": "十字街道",
-    //         "recordOrganCode": "320000003496",
-    //         "cardType": "01",
-    //         "team": "1号",
-    //         "restCounty": "沭阳县",
-    //         "manTel": "19812285145",
-    //         "checkDate": 1752654535000,
-    //         "manDomicileType": "1",
-    //         "domicileMode": "1",
-    //         "manVillage": "学宜",
-    //         "inputOrganCode": "320000003496",
-    //         "doctor": "冯秀芹",
-    //         "idcard": "321322200601023686",
-    //         "manDomicileMode": "1",
-    //         "updateOrganCode": "320000003496",
-    //         "restVillage": "学宜",
-    //         "age": 19
-    // }
-    // console.log('fuYouInfo----开发数据----',fuYouInfo.value)
-    // return
+    // 开发待删除
+    fuYouInfo.value = {
+        "expectedAge": 20,
+            "tbKey": "0",
+            "occupation": "998",
+            "education": "70",
+            "restCity": "宿迁市",
+            "nation": "01",
+            "county": "沭阳县",
+            "cardNo": "321322200601023686",
+            "lmp": 1747584000000,
+            "gravidity": 1,
+            "manTeamNo": "时庄",
+            "restAddrCode": "321322136010",
+            "manNot": "0",
+            "manTeam": "1号",
+            "gestDays": 2,
+            "tel": "18964749402",
+            "manCardType": "01",
+            "workOrgan": "无",
+            "manProv": "江苏省",
+            "inputOrgan": "沭阳十字医院",
+            "town": "十字街道",
+            "updateOrgan": "沭阳十字医院",
+            "manCardNo": "321322199804251237",
+            "inputDate": 1752654535000,
+            "dbKey": "0",
+            "manWorkOrgan": "无",
+            "restTeamNo": "时庄组",
+            "addrCode": "321322136010",
+            "restTeam": "1号",
+            "nationality": "CN",
+            "domicileAddr": "江苏省沭阳县龙庙镇聂湾村直属组37号",
+            "checkPeriod": "1",
+            "gestWeeks": 8,
+            "name": "章舟月",
+            "doctorCode": "320823198102020627",
+            "manAddrCode": "321322136010",
+            "restProv": "江苏省",
+            "manOccupation": "998",
+            "manDomicileAddr": "江苏省沭阳县沭城镇学宜居委会时庄组1号",
+            "organ": "沭阳县十字街道学宜居委会",
+            "healthNo": "3213222503902",
+            "birthday": 1136131200000,
+            "updateDate": 1757403531000,
+            "inputDoctorCode": "320823198102020627",
+            "manBirthday": 893437200000,
+            "sysId": "437fcb4d-5890-42c3-931a-009908696d7b",
+            "manName": "乔勇翔",
+            "updateDoctorCode": "320823198102020627",
+            "city": "宿迁市",
+            "parity": 0,
+            "updateDoctor": "冯秀芹",
+            "manNation": "01",
+            "domicileType": "1",
+            "faceMum": "47f54be0-e310-4ae3-86bf-ca563b793adf",
+            "expectedDate": 1771776000000,
+            "manCounty": "沭阳县",
+            "manAge": 27,
+            "manTown": "十字街道",
+            "teamNo": "时庄组",
+            "inputDoctor": "冯秀芹",
+            "marriage": "20",
+            "organCode": "32000000353057",
+            "manNationality": "CN",
+            "faceDady": "1b52b83a-11fd-4be3-a9fd-d44175a78f7a",
+            "village": "学宜",
+            "prov": "江苏省",
+            "manCity": "宿迁市",
+            "recordOrgan": "沭阳十字医院",
+            "restTown": "十字街道",
+            "recordOrganCode": "320000003496",
+            "cardType": "01",
+            "team": "1号",
+            "restCounty": "沭阳县",
+            "manTel": "19812285145",
+            "checkDate": 1752654535000,
+            "manDomicileType": "1",
+            "domicileMode": "1",
+            "manVillage": "学宜",
+            "inputOrganCode": "320000003496",
+            "doctor": "冯秀芹",
+            "idcard": "321322200601023686",
+            "manDomicileMode": "1",
+            "updateOrganCode": "320000003496",
+            "restVillage": "学宜",
+            "age": 19
+    }
+    console.log('fuYouInfo----开发数据----',fuYouInfo.value)
+    return
     requestFuYou(JSON.stringify(params)).then(res => {
       if (res.result === "fail") {
         ElMessage({