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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9504
+org_id = 10088
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -1976,26 +1976,28 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			var rf []*ResultFive
 			json.Unmarshal([]byte(his.Iinfo), &rf)
-			var insutypes []string
+			var insutypes []*ResultFive
 			var insutype string
+			var insuplc_admdvs string
 			var is390 int = 0
 			var is310 int = 0
 
 			for _, item := range rf {
 				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
-					insutypes = append(insutypes, item.Insutype)
+					insutypes = append(insutypes, item)
 				}
 			}
 
 			if len(insutypes) == 1 {
-				insutype = insutypes[0]
+				insutype = insutypes[0].Insutype
+				//insuplc_admdvs = insutypes[0].InsuplcAdmdvs
 			} else {
 				for _, i := range insutypes {
-					if i == "390" {
+					if i.Insutype == "390" {
 						is390 = 1
 					}
 
-					if i == "310" {
+					if i.Insutype == "310" {
 						is310 = 1
 					}
 				}
@@ -2015,12 +2017,16 @@ func (c *HisApiController) GetRegisterInfo() {
 			if len(insutypes) == 2 {
 				insutype = med_type
 			}
-
+			for _, item := range rf {
+				if item.Insutype == insutype {
+					insuplc_admdvs = item.InsuplcAdmdvs
+				}
+			}
 			var resThree ResultThree
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				api := "http://192.168.124.4:9532/" + "hbyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id
+					"&insuplc_admdvs=" + insuplc_admdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2053,7 +2059,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			} else {
 				fmt.Println(roles.UserName)
-				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
+				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
 				saveLog(result, requestLog, "2201", "挂号")
 				if err := json.Unmarshal([]byte(result), &resThree); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
@@ -2090,6 +2096,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.UserOrgId = adminInfo.CurrentOrgId
 			his.Ctime = time.Now().Unix()
 			his.Mtime = time.Now().Unix()
+			his.InsuplcAdmdvs = insuplc_admdvs
 			his.Status = 1
 			service.UpdateHisPatientStatus(&his)
 			service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
@@ -2241,7 +2248,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["med_type"] = strconv.FormatInt(reg_type, 10)
 			data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 			data["fixmedins_code"] = miConfig.Code
-			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+			data["insuplc_admdvs"] = his.InsuplcAdmdvs
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 			data["secret_key"] = miConfig.SecretKey
 			data["sick_code"] = sickConfig.CountryCode
@@ -2278,9 +2285,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 		} else {
 			if miConfig.InsuplcAdmdvs == "440781" { //
-				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			} else {
-				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			}
 			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
@@ -2321,13 +2328,18 @@ func (c *HisApiController) GetUploadInfo() {
 		} else {
 			his.Diagnosis = diagnosis_id
 			his.SickType = sickConfig.ID
-			his.PType = fmt.Sprintf("%d", reg_type)
+			var p_type int64
+			if reg_type == 1111 || reg_type == 1112 {
+				p_type = 11
+
+			}
+			his.PType = fmt.Sprintf("%d", p_type)
 			service.UpdateHisPatientThree(&his)
 
 			data := make(map[string]interface{})
 			if settle_accounts_type == 1 { //日结
 
-				if reg_type == 11 {
+				if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 					prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
 				} else {
 					prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
@@ -2359,10 +2371,6 @@ func (c *HisApiController) GetUploadInfo() {
 
 			}
 
-			if reg_type == 1111 || reg_type == 1112 {
-				reg_type = 11
-			}
-
 			timestamp := time.Now().Unix()
 			tempTime := time.Unix(timestamp, 0)
 			timeFormat := tempTime.Format("20060102150405")
@@ -2385,7 +2393,7 @@ func (c *HisApiController) GetUploadInfo() {
 				data["dept_code"] = department.Number
 			}
 
-			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+			data["insuplc_admdvs"] = his.InsuplcAdmdvs
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 			data["secret_key"] = miConfig.SecretKey
 			data["balance_accounts_type"] = strconv.FormatInt(his.BalanceAccountsType, 10)
@@ -2428,7 +2436,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 
 				} else {
-					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string))
+					result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, data["dept"].(string), data["fixmedins_code"].(string), data["dept_code"].(string), data["doctor_id"].(string), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["balance_accounts_type"].(string))
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)
@@ -2636,7 +2644,7 @@ func (c *HisApiController) GetUploadInfo() {
 							api := "http://192.168.124.4:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-								"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
 								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
@@ -2670,7 +2678,7 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 
 						} else {
-							result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
+							result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
 							var dat map[string]interface{}
 							if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 								fmt.Println(dat)
@@ -2889,7 +2897,7 @@ func (c *HisApiController) GetUploadInfo() {
 				api := "http://192.168.124.4:9532/" + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 					his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 					"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
 					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag
@@ -2925,7 +2933,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 			} else {
 
-				result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+				result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -3716,7 +3724,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 		data := make(map[string]interface{})
 		if settle_accounts_type == 1 { //日结
-			if reg_type == 11 {
+			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
 			} else {
 				prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime, strconv.Itoa(int(reg_type)))
@@ -3745,10 +3753,6 @@ func (c *HisApiController) GetPreUploadInfo() {
 			data["pre"] = prescriptions
 		}
 
-		if reg_type == 1111 || reg_type == 1112 {
-			reg_type = 11
-		}
-
 		client := &http.Client{}
 		data["psn_no"] = his.PsnNo
 		data["mdtrt_id"] = his.Number
@@ -4391,9 +4395,10 @@ func (c *HisApiController) Refund() {
 	//	return
 	//}
 	//recordDateTime := theTime.Unix()
-	//his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
+	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
+
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	if order.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4410,7 +4415,7 @@ func (c *HisApiController) Refund() {
 		if miConfig.MdtrtareaAdmvs == "421300" {
 			api3 := "http://192.168.124.4:9532/" + "hbyb/2208?psn_no=" + order.PsnNo +
 				"&mdtrt_id=" + order.MdtrtId + "&setl_id=" + order.SetlId + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp3, requestErr3 := http.Get(api3)
 			if requestErr3 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4440,7 +4445,7 @@ func (c *HisApiController) Refund() {
 			}
 
 		} else {
-			result, src_resquest = service.Gdyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+			result, src_resquest = service.Gdyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -4463,7 +4468,7 @@ func (c *HisApiController) Refund() {
 
 				api3 := "http://192.168.124.4:9532/" + "hbyb/2205?psn_no=" + order.PsnNo +
 					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp3, requestErr3 := http.Get(api3)
 				if requestErr3 != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4494,7 +4499,7 @@ func (c *HisApiController) Refund() {
 
 			} else {
 
-				result2, src_request := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+				result2, src_request := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -4577,7 +4582,7 @@ func (c *HisApiController) RefundNumber() {
 
 			api3 := "http://192.168.124.4:9532/" + "hbyb/2202?psn_no=" + his.PsnNo +
 				"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp3, requestErr3 := http.Get(api3)
 			if requestErr3 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4611,7 +4616,7 @@ func (c *HisApiController) RefundNumber() {
 
 			api3 := "http://127.0.0.1:9532/" + "gdyb/three?psn_no=" + his.PsnNo +
 				"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp3, requestErr3 := http.Get(api3)
 			if requestErr3 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4676,7 +4681,7 @@ func (c *HisApiController) RefundNumber() {
 }
 func (c *HisApiController) RefundDetail() {
 	order_id, _ := c.GetInt64("order_id")
-	his_patient_id, _ := c.GetInt64("his_patient_id")
+	//his_patient_id, _ := c.GetInt64("his_patient_id")
 
 	number := c.GetString("number")
 	record_time := c.GetString("record_time")
@@ -4691,7 +4696,8 @@ func (c *HisApiController) RefundDetail() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-	his, _ := service.GetNewVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	//his, _ := service.GetNewVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
@@ -4703,11 +4709,12 @@ func (c *HisApiController) RefundDetail() {
 		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
 
 	}
+	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
 			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+			"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 		resp2, requestErr2 := http.Get(api2)
 		if requestErr2 != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -5339,7 +5346,7 @@ func (c *HisApiController) GetSettleAccounts() {
 	baseParams := models.BaseParams{
 		SecretKey:      miConfig.SecretKey,
 		FixmedinsCode:  miConfig.Code,
-		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
+		InsuplcAdmdvs:  his.InsuplcAdmdvs,
 		MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
 		OrgName:        miConfig.OrgName,
 		Doctor:         user_name,
@@ -5356,7 +5363,7 @@ func (c *HisApiController) GetSettleAccounts() {
 
 			api := "http://192.168.124.4:9532/" + "hbyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/sz/sz_his_api_controller.go

@@ -2285,7 +2285,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 							ChargeSerialNumber: newFl,
 							Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
 							CodeName:           subItem.BaseDrugLib.DrugName,
-							BwCode:				subItem.BaseDrugLib.Code,
+							BwCode:             subItem.BaseDrugLib.Code,
 							Flag:               "1",
 							Price:              price,
 							Count:              subItem.PrescribingNumber,
@@ -2319,7 +2319,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 								OrderType:          "1",
 								ChargeSerialNumber: newFl,
 								Code:               subItem.HisProject.MedicalCode,
-								BwCode:				subItem.HisProject.MedicalCode,
+								BwCode:             subItem.HisProject.MedicalCode,
 								CodeName:           subItem.HisProject.ProjectName,
 								Flag:               "1",
 								Price:              subItem.Price,
@@ -2350,7 +2350,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 								ChargeSerialNumber: newFl,
 								Code:               subItem.GoodInfo.MedicalInsuranceNumber,
 								CodeName:           subItem.GoodInfo.GoodName,
-								BwCode:				subItem.GoodInfo.MedicalInsuranceNumber,
+								BwCode:             subItem.GoodInfo.MedicalInsuranceNumber,
 								Flag:               "1",
 								Price:              subItem.Price,
 								Count:              count,
@@ -3031,8 +3031,12 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 	var start_time int64
 	var end_time int64
 
+	if reg_type == 1111 || reg_type == 1112 {
+		reg_type = 11
+	}
 	if settle_accounts_type == 1 { //日结
-		if reg_type == 11 {
+
+		if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 
 			prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
 		} else {
@@ -3117,7 +3121,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 						OrderType:          "1",
 						ChargeSerialNumber: newFl,
 						Code:               subItem.BaseDrugLib.MedicalInsuranceNumber,
-						BwCode:				subItem.BaseDrugLib.Code,
+						BwCode:             subItem.BaseDrugLib.Code,
 						CodeName:           subItem.BaseDrugLib.DrugName,
 						Flag:               "1",
 						Price:              price,
@@ -3153,7 +3157,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 							ChargeSerialNumber: newFl,
 							Code:               subItem.HisProject.MedicalCode,
 							CodeName:           subItem.HisProject.ProjectName,
-							BwCode:				subItem.HisProject.MedicalCode,
+							BwCode:             subItem.HisProject.MedicalCode,
 							Flag:               "1",
 							Price:              subItem.Price,
 							Count:              count,
@@ -3183,7 +3187,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 							OrderType:          "1",
 							ChargeSerialNumber: newFl,
 							Code:               subItem.GoodInfo.MedicalInsuranceNumber,
-							BwCode:               subItem.GoodInfo.MedicalInsuranceNumber,
+							BwCode:             subItem.GoodInfo.MedicalInsuranceNumber,
 							CodeName:           subItem.GoodInfo.GoodName,
 							Flag:               "1",
 							Price:              subItem.Price,

models/his_models.go

@@ -124,6 +124,7 @@ type HisPatient struct {
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
+	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (HisPatient) TableName() string {
@@ -801,6 +802,7 @@ type VMHisPatient struct {
 	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (VMHisPatient) TableName() string {

service/gdyb_service.go

@@ -531,6 +531,10 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
 
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+
 	inputMessage["infno"] = "2203"        // 交易编码
 	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
@@ -636,6 +640,10 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
 
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+
 	inputMessage["infno"] = "2203A"       // 交易编码
 	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
@@ -1112,7 +1120,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		}
 	}
 	if insuplc_admdvs == "421300" {
-		if med_type == "11" {
+		if med_type == "11" || med_type == "1112" || med_type == "1111" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
 			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
@@ -1222,7 +1230,9 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		}
 	}
-
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
 	if insuplc_admdvs == "421300" {
 		if med_type == "11" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
@@ -1822,6 +1832,9 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 }
 
 func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -2681,6 +2694,165 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	return str
 }
 
+//func Gdyb7101(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string) string {
+//	// 生成签名
+//	nonce := GetRandomString(32)
+//	timestamp := time.Now().Unix()
+//	signature := setSignature(timestamp, nonce, secret_key)
+//	tempTime := time.Unix(timestamp, 0)
+//	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+//
+//	timeFormatTwo := tempTime.Format("2006-01-02")
+//
+//	t := time.Now()
+//	last := time.Date(t.Year(), time.December, 31, 0, 0, 0, 0, time.UTC)
+//	tm := time.Unix(last.Unix(), 0)
+//
+//	// 生成输入报文
+//	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+//	input := make(map[string]interface{})
+//	inputData := make(map[string]interface{})
+//
+//	inputData2 := make(map[string]interface{})
+//
+//	inputMessage["infno"] = "7101"                 // 交易编码
+//	inputData["hosp_rxno"] = psnNo                    // 人员编号 （来自1101接口返回）
+//	inputData["init_rxno"] = insutype               // 险种类型（来自1101接口返回）
+//	inputData["rx_type_code"] = sick_code        // 险种类型（来自1101接口返回）
+//	inputData["prsc_time"] = sick_name        // 险种类型（来自1101接口返回）
+//	inputData["rx_drug_nums"] = insuplc_admdvs      // 险种类型（来自1101接口返回）
+//	inputData["rx_way_codg"] = fixmedins_code // 险种类型（来自1101接口返回）
+//	inputData["rx_way_name"] = org_name     // 险种类型（来自1101接口返回）
+//	inputData["rx_freq_codg"] = timeFormatTwo     // 险种类型（来自1101接口返回）
+//	inputData["rx_freq_name"] = doctor_id          // 开始时间
+//	inputData["rx_dosunt"] = doctor             // 开始时间
+//	inputData["rx_doscnt"] = timeFormatTwo          // 医师编码
+//	inputData["rx_drord_dscr"] = ""                          // 医师编码
+//	inputData["valid_days"] = ""                         // 医师编码
+//	inputData["valid_end_time"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["rept_flag"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["max_rept_cnt"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["reptd_cnt"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["min_inrv_days"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["dr_sign_info"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["phar_sign_info"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["fixmedins_sign_info"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["rx_cotn_flag"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["rx_file"] = tm.Format("2006-01-02") // 医师编码
+//	input["data"] = inputData
+//
+//
+//	inputData2["med_list_codg"] = psnNo                    // 人员编号 （来自1101接口返回）
+//	inputData2["fixmedins_hilist_id"] = insutype               // 险种类型（来自1101接口返回）
+//	inputData["hosp_prep_flag"] = sick_code        // 险种类型（来自1101接口返回）
+//	inputData["rx_item_type_code"] = sick_name        // 险种类型（来自1101接口返回）
+//	inputData["rx_item_type_name"] = insuplc_admdvs      // 险种类型（来自1101接口返回）
+//	inputData["tcmdrug_type_name"] = fixmedins_code // 险种类型（来自1101接口返回）
+//	inputData["tcmdrug_type_code"] = org_name     // 险种类型（来自1101接口返回）
+//	inputData["tcmherb_foote"] = timeFormatTwo     // 险种类型（来自1101接口返回）
+//	inputData["medn_type_code"] = doctor_id          // 开始时间
+//	inputData["medn_type_name"] = doctor             // 开始时间
+//	inputData["main_medc_flag"] = timeFormatTwo          // 医师编码
+//	inputData["urgt_flag"] = ""                          // 医师编码
+//	inputData["bas_medn_flag"] = ""                         // 医师编码
+//	inputData["imp_drug_flag"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["prod_barc"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_prodname"] = tm.Format("2006-01-02") // 医师编码
+//
+//	inputData["genname_codg"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_genname"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["chemname"] = tm.Format("2006-01-02") // 医师编码
+//
+//	inputData["drugstdcode"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_dosform"] = tm.Format("2006-01-02") // 医师编码
+//
+//
+//	inputData["drug_spec"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["prdr_name"] = tm.Format("2006-01-02") // 医师编码
+//
+//
+//	inputData["drug_pric"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_cnt"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_cnt_unit"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_sumamt"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["medc_way_codg"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["medc_way_dscr"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["medc_starttime"] = tm.Format("2006-01-02") // 医师编码
+//
+//	inputData["medc_endtime"] = tm.Format("2006-01-02") // 医师编码
+//
+//
+//	inputData["medc_days"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_dosunt"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["sin_doscnt"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["sin_dosunt"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["used_frqu_codg"] = tm.Format("2006-01-02") // 医师编码
+//
+//
+//	inputData["used_frqu_name"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_totlnt"] = tm.Format("2006-01-02") // 医师编码
+//
+//	inputData["drug_totlnt_emp"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["dise_codg"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_res"] = tm.Format("2006-01-02") // 医师编码
+//	inputData["drug_limit"] = tm.Format("2006-01-02") // 医师编码
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//	input["rxdrugdetail"] = inputData2
+//
+//
+//
+//
+//	inputMessage["input"] = input //交易输入
+//	bytesData, err := json.Marshal(inputMessage)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	reader := bytes.NewReader(bytesData)
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2503"
+//	gdyb_url := beego.AppConfig.String("gdyb_url")
+//	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+//	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+//	url := gdyb_url + "2503"
+//
+//	request, err := http.NewRequest("POST", url, reader)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//
+//	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//	request.Header.Set("x-tif-paasid", gdyb_paasid)
+//	request.Header.Set("x-tif-signature", signature)
+//	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+//	request.Header.Set("x-tif-nonce", nonce)
+//
+//	client := http.Client{}
+//	resp, err := client.Do(request)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	respBytes, err := ioutil.ReadAll(resp.Body)
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error()
+//	}
+//	str := string(respBytes)
+//	fmt.Println(str)
+//	return str
+//}
+
 // 生成签名
 func setSignature(timestamp int64, nonce string, secret_key string) string {
 	str := strconv.FormatInt(timestamp, 10) + secret_key + nonce + strconv.FormatInt(timestamp, 10)

service/hbyb_service.go

@@ -213,7 +213,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	inputData["birctrl_matn_date"] = "" // 计划生育手术或生育日期
 
 	if insuplc_admdvs == "421300" {
-		if med_type == "11" {
+		if med_type == "11" || med_type == "1111" || med_type == "1112" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
 			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
@@ -495,8 +495,13 @@ func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		}
 	}
+	if med_type == "1111" || med_type == "1112" {
+
+		med_type = "11"
+	}
+
 	if insuplc_admdvs == "421300" {
-		if med_type == "11" {
+		if med_type == "11" || med_type == "1111" || med_type == "1112" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
 			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
@@ -562,9 +567,12 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		}
 	}
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
 
 	if insuplc_admdvs == "421300" {
-		if med_type == "11" {
+		if med_type == "11" || med_type == "1111" || med_type == "1112" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
 			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号