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

controllers/sg/his_api_controller.go

@@ -97,7 +97,7 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 	var res Result5301
 	var res10265 Result5301For10265
 
-	if miConfig.MdtrtareaAdmvs == "320921" {
+	if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 		psn_info, _ := service.GetPsnByPatientId(patient_id)
 		api := "http://192.168.3.111:9532/" + "jsyb/5301?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&psn_no=" + psn_info.PsnNo + "&cainfo=" + miConfig.Cainfo
@@ -382,7 +382,7 @@ func (c *HisApiController) ReadCard() {
 				return
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "320921" {
+		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
 			api := "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo
@@ -3623,7 +3623,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			idetinfoStr = psn_info.Idetinfo
 			infocode = 0
 
-		} else if miConfig.MdtrtareaAdmvs == "320921" {
+		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 			psn_info, _ := service.GetPsnByPatientId(id)
 			PsnNo = psn_info.PsnNo
 			PsnCertType = psn_info.PsnCertType
@@ -3837,7 +3837,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 				infocode = resThree.Infcode
 
-			} else if miConfig.MdtrtareaAdmvs == "320921" {
+			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 				psn_info, _ := service.GetPsnByPatientId(id)
 				bas := strings.Split(psn_info.CardInfo, "|")
 
@@ -4135,7 +4135,7 @@ func (c *HisApiController) GetUploadInfo() {
 				return
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "320921" {
+		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
 			//江苏地区国家医保医疗类别
 			//职工透析：医疗类别选特殊情况门诊9933
@@ -4409,7 +4409,7 @@ func (c *HisApiController) GetUploadInfo() {
 						return
 					}
 
-				} else if miConfig.MdtrtareaAdmvs == "320921" {
+				} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 					bytesData, _ := json.Marshal(data)
 					req, _ := http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 					resp, _ := client.Do(req)
@@ -4756,7 +4756,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 							}
 
-						} else if miConfig.MdtrtareaAdmvs == "320921" {
+						} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
@@ -5138,7 +5138,7 @@ func (c *HisApiController) GetUploadInfo() {
 					return
 				}
 
-			} else if miConfig.MdtrtareaAdmvs == "320921" {
+			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 				psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 				psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
@@ -6005,7 +6005,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			return
 		}
 
-	} else if miConfig.MdtrtareaAdmvs == "320921" {
+	} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 		//江苏地区国家医保医疗类别
 		//职工透析：医疗类别选特殊情况门诊9933
 		//居民血透门慢： 医疗类别选门诊慢病1402
@@ -6268,7 +6268,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					return
 				}
 
-			} else if miConfig.MdtrtareaAdmvs == "320921" {
+			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 				bytesData, _ := json.Marshal(data)
 				req, _ := http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 				resp, _ := client.Do(req)
@@ -6566,7 +6566,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 							return
 						}
 
-					} else if miConfig.MdtrtareaAdmvs == "320921" {
+					} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 						psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
@@ -7094,7 +7094,7 @@ func (c *HisApiController) Refund() {
 				return
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "320921" {
+		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 			api3 := "http://192.168.3.111:9532/" + "jsyb/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 + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
@@ -7216,7 +7216,7 @@ func (c *HisApiController) Refund() {
 					return
 				}
 
-			} else if miConfig.MdtrtareaAdmvs == "320921" {
+			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
 				api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
 					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
@@ -7398,7 +7398,7 @@ func (c *HisApiController) RefundNumber() {
 				return
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "320921" {
+		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
 			api3 := "http://192.168.3.111:9532/" + "jsyb/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 +
@@ -7612,7 +7612,7 @@ func (c *HisApiController) RefundDetail() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
-		} else if miConfig.MdtrtareaAdmvs == "320921" {
+		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 			var resSix10265 ResultSix10265
 
 			api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
@@ -7753,7 +7753,7 @@ func (c *HisApiController) GetCheckAccount() {
 	var res ResultEight
 	var res10188 ResultEightFor10188
 	if config.IsOpen == 1 {
-		if miConfig.MdtrtareaAdmvs == "320921" {
+		if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 			api := "http://192.168.3.111:9532/" + "jsyb/3201" +
 				"insutype=" + insutype +
 				"&clr_type=" + clr_type +
@@ -7909,10 +7909,10 @@ func (c *HisApiController) Check310() {
 		"&setl_optins=" + "441202" +
 		"&stmt_begndate=" + "2022-02-01" +
 		"&stm_enddate=" + "2022-02-28" +
-		"&medfee_sumamt=" + "155812.88" +
-		"&fund_pay_sumamt=" + "151026.15" +
+		"&medfee_sumamt=" + "194318.01" +
+		"&fund_pay_sumamt=" + "188142.98" +
 		"&acct_pay=" + "0" +
-		"&fixmedins_setl_cnt=" + "73" +
+		"&fixmedins_setl_cnt=" + "451" +
 		"&fixmedins_code=" + miConfig.Code +
 		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 		"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -7964,10 +7964,10 @@ func (c *HisApiController) Check390() {
 		"&setl_optins=" + "441202" +
 		"&stmt_begndate=" + "2022-02-01" +
 		"&stm_enddate=" + "2022-02-28" +
-		"&medfee_sumamt=" + "933920.08" +
-		"&fund_pay_sumamt=" + "887153.34" +
+		"&medfee_sumamt=" + "1062574.78" +
+		"&fund_pay_sumamt=" + "1009049.79 " +
 		"&acct_pay=" + "0" +
-		"&fixmedins_setl_cnt=" + "396" +
+		"&fixmedins_setl_cnt=" + "1944" +
 		"&fixmedins_code=" + miConfig.Code +
 		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 		"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -8406,7 +8406,7 @@ func (c *HisApiController) GetSettleAccounts() {
 				return
 			}
 
-		} else if miConfig.MdtrtareaAdmvs == "320921" {
+		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
 			api := "http://192.168.3.111:9532/" + "jsyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
@@ -9458,7 +9458,7 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
 	var res ResultTwo
 	var res10265 ResultTwo10265
-	if miConfig.MdtrtareaAdmvs == "320921" {
+	if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 		psn_info, _ := service.GetPsnByPatientId(patient.ID)
 		api := "http://192.168.3.111:9532/" + "hbyb/1101?cert_no=" + "" +
 			"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
@@ -9584,7 +9584,7 @@ func (c *HisApiController) PsnPutNCDSOnRecord() {
 	var res2 ResultThirteen
 	var res10265_2 ResultThirteen10265
 	if config.IsOpen == 1 {
-		if miConfig.MdtrtareaAdmvs == "320921" {
+		if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
 		} else {
 			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, start_time, end_time, check_time)