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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 10215
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,11 +57,11 @@ 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_paasid = "sg03_prd"
+# gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"
-# gdyb_paasid = "zq_prd_yjyy"
+gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/hb/hbyb_controller.go

@@ -185,8 +185,9 @@ func (c *HBybController) PostFour() {
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
+	begin_time := respJSON["begin_time"].(string)
 
-	result, request_log := service.Hbyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config)
+	result, request_log := service.Hbyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, begin_time)
 
 	fmt.Println(request_log)
 

controllers/js/jsyb_controller.go

@@ -176,8 +176,9 @@ func (c *JSybController) PostFour() {
 	secret_key := respJSON["secret_key"].(string)
 	url := respJSON["url"].(string)
 	ak := respJSON["ak"].(string)
+	begin_time := respJSON["begin_time"].(string)
 
-	result, request_log := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak)
+	result, request_log := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak, begin_time)
 
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {

controllers/sg/his_api_controller.go

@@ -3310,6 +3310,7 @@ func (c *HisApiController) GetUploadInfo() {
 	diagnosis_id := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
+	begin_time := c.GetString("begin_time")
 
 	id_str := c.GetString("ids")
 	ids_arr := strings.Split(id_str, ",")
@@ -3411,6 +3412,8 @@ func (c *HisApiController) GetUploadInfo() {
 			data["sick_name"] = sickConfig.ClassName
 			data["dept"] = strconv.FormatInt(department.ID, 10)
 			data["config"] = config
+			data["begin_time"] = begin_time
+
 			bytesData, _ := json.Marshal(data)
 			req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2203", bytes.NewReader(bytesData))
 			resp, _ := client.Do(req)
@@ -3458,6 +3461,8 @@ func (c *HisApiController) GetUploadInfo() {
 			data["sick_name"] = sickConfig.ClassName
 			data["url"] = miConfig.Url
 			data["ak"] = miConfig.ChannelNumber
+			data["begin_time"] = begin_time
+
 			data["dept"] = strconv.FormatInt(department.ID, 10)
 			data["config"] = config
 			bytesData, _ := json.Marshal(data)
@@ -3490,7 +3495,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 		} else {
 			if miConfig.MdtrtareaAdmvs == "440781" { //
-				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, 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.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 			} else {
 				if miConfig.Code == "H15049901371" {
 					//赤峰地区国家医保医疗类别
@@ -3511,10 +3516,10 @@ func (c *HisApiController) GetUploadInfo() {
 							med_type = "11"
 						}
 					}
-					result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, med_type, doctor_info.DoctorNumber, miConfig.Code, his.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, med_type, doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 
 				} else {
-					result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.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.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 
 				}
 			}
@@ -5084,6 +5089,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 	diagnosis_id := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
+	begin_time := c.GetString("begin_time")
 
 	id_str := c.GetString("ids")
 	ids_arr := strings.Split(id_str, ",")
@@ -5155,6 +5161,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["secret_key"] = miConfig.SecretKey
 		data["sick_code"] = sickConfig.CountryCode
 		data["sick_name"] = sickConfig.ClassName
+		data["begin_time"] = begin_time
 		data["dept"] = strconv.FormatInt(department.ID, 10)
 		data["config"] = config
 
@@ -5187,11 +5194,60 @@ func (c *HisApiController) GetPreUploadInfo() {
 			return
 		}
 
+	} else if miConfig.InsuplcAdmdvs == "320921" {
+		data := make(map[string]interface{})
+		client := &http.Client{}
+		data["psn_no"] = his.PsnNo
+		data["mdtrt_id"] = his.Number
+		data["doctor"] = roles.UserName
+		data["department"] = department.Name
+		data["org_name"] = miConfig.OrgName
+		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["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
+		data["secret_key"] = miConfig.SecretKey
+		data["sick_code"] = sickConfig.CountryCode
+		data["sick_name"] = sickConfig.ClassName
+		data["begin_time"] = begin_time
+		data["dept"] = strconv.FormatInt(department.ID, 10)
+		data["config"] = config
+
+		fmt.Println(data)
+
+		bytesData, _ := json.Marshal(data)
+		req, _ := http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
+		resp, _ := client.Do(req)
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		userJSONBytes, _ := json.Marshal(respJSON)
+		fmt.Println("log")
+		fmt.Println(string(userJSONBytes))
+		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
 	} else {
 		var result string
 		var requestLog string
 		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.DoctorNumber, 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.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 		} else {
 			if miConfig.Code == "H15049901371" {
 				//赤峰地区国家医保医疗类别
@@ -5211,9 +5267,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 						med_type = "11"
 					}
 				}
-				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, med_type, doctor_info.DoctorNumber, miConfig.Code, his.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, med_type, doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 			} else {
-				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, 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.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 
 			}
 			saveLog(result, requestLog, "2203", "上传就诊信息")
@@ -5223,13 +5279,6 @@ func (c *HisApiController) GetPreUploadInfo() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-			//userJSONBytes2, _ := json.Marshal(respJSON2)
-			//if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-			//	utils.ErrorLog("解析失败：%v", err)
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			//	return
-			//}
-
 			userJSONBytes2, _ := json.Marshal(respJSON2)
 			if miConfig.Code == "H15049901371" {
 				if err := json.Unmarshal(userJSONBytes2, &resSix10265); err != nil {

service/gdyb_service.go

@@ -538,7 +538,8 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string) (string, string) {
+
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -555,11 +556,11 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		med_type = "11"
 	}
 
-	inputMessage["infno"] = "2203"        // 交易编码
-	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputMessage["infno"] = "2203"     // 交易编码
+	inputData["mdtrt_id"] = mdtrtId    // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo        // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type   // 医疗类别 16门诊特殊病
+	inputData["begntime"] = begin_time // 开始时间
 	//inputData["begntime"] =  // 开始时间
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
 	inputData["dise_codg"] = sick_code  // 病种编码
@@ -652,7 +653,8 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 }
 
 // 门诊就诊信息上传
-func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
+func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string) (string, string) {
+
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -670,11 +672,11 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		med_type = "11"
 	}
 
-	inputMessage["infno"] = "2203A"       // 交易编码
-	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputMessage["infno"] = "2203A"    // 交易编码
+	inputData["mdtrt_id"] = mdtrtId    // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo        // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type   // 医疗类别 16门诊特殊病
+	inputData["begntime"] = begin_time // 开始时间
 
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
 	inputData["dise_codg"] = sick_code  // 病种编码

service/hbyb_service.go

@@ -187,7 +187,7 @@ func Hbyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
+func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -204,7 +204,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
 	//inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputData["begntime"] = begin_time // 开始时间
 	//inputData["begntime"] =  // 开始时间
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
 	inputData["dise_codg"] = sick_code  // 病种编码

service/jsyb_service.go

@@ -138,7 +138,7 @@ func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string) (string, string) {
+func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, request_url string, access_key string, begin_time string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -153,11 +153,11 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		med_type = "11"
 	}
 
-	inputMessage["infno"] = "2203"        // 交易编码
-	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputMessage["infno"] = "2203"     // 交易编码
+	inputData["mdtrt_id"] = mdtrtId    // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo        // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type   // 医疗类别 16门诊特殊病
+	inputData["begntime"] = begin_time // 开始时间
 	//inputData["begntime"] =  // 开始时间
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
 	inputData["dise_codg"] = sick_code  // 病种编码