Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -6287,6 +6287,16 @@ type ResultFour10265 struct {
 	Signtype    string `json:"signtype"`
 	WarnMsg     string `json:"warn_msg"`
 }
+type ResultMemo struct {
+	InsuAdmdvs string `json:"insuAdmdvs"`
+}
+
+//[{"begntime":"2022-01-01 00:00:00","endtime":"2022-12-31 00:00:00","memo":"{\"matIdetCode\":\"20\",\"insuAdmdvs\":\"350481\"}","psn_idet_type":"23","psn_type_lv":null}]
+type ResultIDInfo struct {
+	Begntime string     `json:"begntime"`
+	Endtime  string     `json:"endtime"`
+	Memo     ResultMemo `json:"memo"`
+}
 
 type ResultFive struct {
 	Balc                   float64 `json:"balc"`
@@ -7506,7 +7516,15 @@ func (c *HisApiController) GetRegisterInfo() {
 				insuplc_admdvs_temp = insuplc_admdvs
 
 			}
-
+			if miConfig.MdtrtareaAdmvs == "350500" {
+				var rf []*ResultIDInfo
+				json.Unmarshal([]byte(idetinfoStr), &rf)
+				if len(rf) > 0 {
+					if len(rf[0].Memo.InsuAdmdvs) > 0 {
+						insuplc_admdvs_temp = rf[0].Memo.InsuAdmdvs
+					}
+				}
+			}
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				hb_doctor_info, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, patientPrescription.DoctorId)