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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10265
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,10 +53,10 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
-#gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
 gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yjyy"

controllers/sg/his_api_controller.go

@@ -2613,6 +2613,21 @@ type ResultThirteen struct {
 	WarnInfo    interface{} `json:"warn_info"`
 }
 
+type ResultThirteen10265 struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Result struct {
+			TrtDclaDetlSn string `json:"trt_dcla_detl_sn"`
+		} `json:"result"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
 type ResultFourteen struct {
 	ErrMsg      string `json:"err_msg"`
 	InfRefmsgid string `json:"inf_refmsgid"`
@@ -7664,7 +7679,7 @@ func (c *HisApiController) PsnUnPutOnRecord() {
 }
 func (c *HisApiController) PsnPutNCDSOnRecord() {
 	patient_id, _ := c.GetInt64("patient_id")
-	insutype := c.GetString("insutype")
+	insutype_two := c.GetString("insutype")
 	psn_no := c.GetString("psn_no")
 	doctor_id, _ := c.GetInt64("doctor_id")
 	sick_id, _ := c.GetInt64("sick_id")
@@ -7675,8 +7690,88 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	sick, _ := service.FindSickById(sick_id)
 	doctor, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
+
+	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
+	result, _ := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", "0", patient.Name)
+	var res ResultTwo
+	var res10265 ResultTwo10265
+
+	if miConfig.Code == "H15049901371" {
+		if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		res.ErrMsg = res10265.ErrMsg
+		res.Output = res10265.Output
+		res.InfRefmsgid = res10265.InfRefmsgid
+
+	} else {
+		if err := json.Unmarshal([]byte(result), &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+	}
+	Iinfos, _ := json.Marshal(res.Output.Iinfo)
+	infoStr := string(Iinfos)
+	var rf []*ResultFive
+	json.Unmarshal([]byte(infoStr), &rf)
+
+	var insuplc_admdvs string
+	var insutype string
+	var is390 int = 0
+	var is310 int = 0
+	var insutypes []*ResultFive
+
+	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) == 2 {
+		insutype = insutype_two
+	}
+
+	if len(insutypes) == 0 {
+		insutype = "310"
+	}
+
+	if len(insutype_two) > 0 {
+		insutype = insutype_two
+	}
+
+	for _, item := range rf {
+		if item.Insutype == insutype {
+			insuplc_admdvs = item.InsuplcAdmdvs
+		}
+	}
+
 	if config.IsOpen == 1 {
-		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.ContentCode)
+		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.ContentCode)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)
@@ -7685,11 +7780,26 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 		}
 		userJSONBytes, _ := json.Marshal(dat)
 		var res2 ResultThirteen
-		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		var res10265 ResultThirteen10265
+
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			res2.ErrMsg = res10265.ErrMsg
+			res2.Output = res10265.Output
+			res2.InfRefmsgid = res10265.InfRefmsgid
+
+		} else {
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		}
+
 		if res2.Infcode == 0 {
 			psnResult := &models.GdybPsnNcdsRecord{
 				UserOrgId:     adminUser.CurrentOrgId,
@@ -7728,12 +7838,84 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 
-	var user_name string
+	//config, _ := service.Ge(adminUser.CurrentOrgId)
+	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, id)
+	//role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	//var user_name string
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	if role.ID == 0 {
-		user_name = "xxx"
+	//if role.ID == 0 {
+	//	user_name = "xxx"
+	//} else {
+	//	user_name = role.UserName
+	//}
+	result, _ := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", "0", patient.Name)
+	var res ResultTwo
+	var res10265 ResultTwo10265
+
+	if miConfig.Code == "H15049901371" {
+		if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		res.ErrMsg = res10265.ErrMsg
+		res.Output = res10265.Output
+		res.InfRefmsgid = res10265.InfRefmsgid
+
 	} else {
-		user_name = role.UserName
+		if err := json.Unmarshal([]byte(result), &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+	}
+	Iinfos, _ := json.Marshal(res.Output.Iinfo)
+	infoStr := string(Iinfos)
+	var rf []*ResultFive
+	json.Unmarshal([]byte(infoStr), &rf)
+
+	var insuplc_admdvs string
+	var insutype string
+	var is390 int = 0
+	var is310 int = 0
+	var insutypes []*ResultFive
+
+	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"
+	}
+
+	for _, item := range rf {
+		if item.Insutype == insutype {
+			insuplc_admdvs = item.InsuplcAdmdvs
+		}
 	}
 
 	psn_record, _ := service.GetPsnNCDSRecordById(id)
@@ -7742,7 +7924,7 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 		return
 	}
 	if config.IsOpen == 1 {
-		result := service.Gdyb2504(psn_record.PsnNo, miConfig.OrgName, user_name, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_record.TrtDclaDetlSn)
+		result := service.Gdyb2504(psn_record.PsnNo, miConfig.OrgName, role.UserName, miConfig.Code, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_record.TrtDclaDetlSn)
 		var dat map[string]interface{}
 		if err := json.Unmarshal([]byte(result), &dat); err == nil {
 			fmt.Println(dat)