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

controllers/zh/zh_his_api_controller.go

@@ -670,6 +670,60 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 
 	}
 
+	//InsuplcAdmdvs = res2.Output.
+
+	Iinfos, _ := json.Marshal(res2.Output.Iinfo)
+	infoStr := string(Iinfos)
+
+	var rf []*ResultFive
+	json.Unmarshal([]byte(infoStr), &rf)
+	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)
+		}
+	}
+
+	if len(insutypes) == 1 {
+		insutype = insutypes[0].Insutype
+		//insuplc_admdvs = insutypes[0].InsuplcAdmdvs
+	} else {
+		for _, i := range insutypes {
+			if i.Insutype == "390" {
+				is390 = 1
+			}
+
+			if i.Insutype == "310" {
+				is310 = 1
+			}
+		}
+	}
+	if is390 == 1 {
+		insutype = "390"
+	}
+
+	if is310 == 1 {
+		insutype = "310"
+	}
+
+	if len(insutypes) == 0 {
+		insutype = "310"
+	}
+
+	if len(insutypes) == 2 {
+		insutype = strconv.FormatInt(social_type, 10)
+	}
+	for _, item := range rf {
+		if item.Insutype == insutype {
+			insuplc_admdvs = item.InsuplcAdmdvs
+		}
+	}
+
 	if res2.Infcode == 0 {
 
 		//var insutypes []string
@@ -768,7 +822,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			dises = append(dises, dise)
 		}
 		struct2401.Diseinfo = dises
-		result := service.ZHGdyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+		result := service.ZHGdyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs)
 
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -848,6 +902,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 				Phone:                phone,
 				BalanceAccountsType:  balance_accounts_type,
 				PsnType:              psn_type,
+				InsuplcAdmdvs:        insuplc_admdvs,
 			}
 			service.CreateHospitalRecord(inHospital)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -952,7 +1007,7 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	struct2402.Diseinfo = dises
 	struct2402.DiseName = sickConfig.ClassName
 	struct2402.DiseCode = sickConfig.CountryCode
-	result := service.ZHGdyb2402(struct2402, miConfig.OrgName, role.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+	result := service.ZHGdyb2402(struct2402, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1089,7 +1144,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 
 	}
 
-	result, src_resquest := service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
+	result, src_resquest := service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -1316,7 +1371,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		data["med_type"] = strconv.FormatInt(record.MedType, 10)
 
 	}
-	data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+	data["insuplc_admdvs"] = record.InsuplcAdmdvs
 	data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 	data["secret_key"] = miConfig.SecretKey
 	var ids []int64
@@ -1683,12 +1738,13 @@ func (c *ZHHisApiController) ZHRefund() {
 	adminUser := c.GetAdminUserInfo()
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
+	record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 
-		result, src_resquest := service.Gdyb2305(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+		result, src_resquest := service.Gdyb2305(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1783,7 +1839,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 		var isSuccess bool = true
 
 		for _, item := range infos {
-			result := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
+			result := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -1840,10 +1896,11 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 		//prescriptions, _ = service.GetZHMonthHisUploadPrescription(adminUser.CurrentOrgId, patient_id, recordDateTime)
 		var order models.HisOrder
 		order, _ = service.GetHisOrderByID(order_id)
+		record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 		config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 		if config.IsOpen == 1 { //对接了医保，走医保流程
 
-			result := service.Gdyb2302(order.PsnNo, order.MdtrtId, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+			result := service.Gdyb2302(order.PsnNo, order.MdtrtId, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -1920,7 +1977,7 @@ func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInHospitalNoExistDataException)
 		return
 	}
-	result := service.ZHGdyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+	result := service.ZHGdyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -1978,7 +2035,7 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInHospitalNoExistDataException)
 		return
 	}
-	result := service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+	result := service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

models/zh_his_models.go

@@ -41,6 +41,7 @@ type HisHospitalCheckRecord struct {
 	Phone                string `gorm:"column:phone" json:"phone" form:"phone"`
 	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
 	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	InsuplcAdmdvs        string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 }
 
 func (HisHospitalCheckRecord) TableName() string {