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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10028
+org_id = 10265
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,13 +54,13 @@ 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/sz_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_paasid = "sg03_prd"
+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"
-gdyb_paasid = "sz_prd_yjyy"
+#gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/sg/his_api_controller.go

@@ -2640,6 +2640,18 @@ type ResultFourteen struct {
 	WarnInfo    interface{} `json:"warn_info"`
 }
 
+type ResultFourteen10265 struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
 type ResultSixteen struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -7900,6 +7912,11 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 	//} else {
 	//	user_name = role.UserName
 	//}
+	psn_record, _ := service.GetPsnNCDSRecordById(id)
+	if psn_record.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorPsnRecordNoExistWrong)
+		return
+	}
 	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
@@ -7965,6 +7982,7 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 	if len(insutypes) == 0 {
 		insutype = "310"
 	}
+	insutype = psn_record.Insutype
 
 	for _, item := range rf {
 		if item.Insutype == insutype {
@@ -7972,11 +7990,6 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 		}
 	}
 
-	psn_record, _ := service.GetPsnNCDSRecordById(id)
-	if psn_record.ID == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorPsnRecordNoExistWrong)
-		return
-	}
 	if config.IsOpen == 1 {
 		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{}
@@ -7988,11 +8001,33 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 
 		userJSONBytes, _ := json.Marshal(dat)
 		var res ResultFourteen
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		var res10265 ResultFourteen10265
+
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &res10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			res.ErrMsg = res10265.ErrMsg
+			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+			res.Infcode = infocode
+			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
+			}
 		}
+
+		//if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		//	utils.ErrorLog("解析失败：%v", err)
+		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		//	return
+		//}
 		if res.Infcode == 0 {
 			psn_record.IsCancel = 2
 			service.CreatePsnNCDSRecord(&psn_record)