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

conf/app.conf

@@ -45,8 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10215
-
+org_id = 10217
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -73,7 +72,7 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #深圳
 # gdyb_paasid = "sz_prd_yjyy"
 #肇庆
-gdyb_paasid = "zq_prd_yjyy"
+# gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"
 #广州
 #gdyb_paasid = "gdyb_inf"

controllers/sg/his_api_controller.go

@@ -86,13 +86,13 @@ func HisManagerApiRegistRouters() {
 }
 
 type Result3101 struct {
-	Infcode     string      `json:"infcode"`
-	InfRefmsgid string      `json:"inf_refmsgid"`
-	RefmsgTime  string      `json:"refmsg_time"`
-	RespondTime string      `json:"respond_time"`
-	Enctype     string      `json:"enctype"`
-	Signtype    string      `json:"signtype"`
-	ErrMsg      interface{} `json:"err_msg"`
+	Infcode     string `json:"infcode"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	RefmsgTime  string `json:"refmsg_time"`
+	RespondTime string `json:"respond_time"`
+	Enctype     string `json:"enctype"`
+	Signtype    string `json:"signtype"`
+	ErrMsg      string `json:"err_msg"`
 	Output      struct {
 		Result []struct {
 			JudgeResultDetailDtos []struct {
@@ -145,6 +145,288 @@ func (c *HisApiController) Get9001() {
 	}
 
 }
+func Check3101ForOne(c *HisApiController, patient_id int64, his models.VMHisPatient, admin_user_id int64, trig_scen string, record_time string, prescriptions []*models.HisPrescription) (res Result3101) {
+
+	adminUser := c.GetAdminUserInfo()
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	//his, _ := service.GetNewHisPatientInfoFour(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	//record_time := c.GetString("record_time")
+	//trig_scen := c.GetString("trig_scen")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return res
+	}
+	recordDateTime := theTime.Unix()
+
+	var patientPrescription models.HisPrescriptionInfo
+	//patientPrescription, _ = service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	//if patientPrescription.ID == 0 {
+	patientPrescription, _ = service.FindLastPatientPrescriptionInfoTwo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	//}
+	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
+	//
+	diagnosis_ids := strings.Split(patientPrescription.Diagnosis, ",")
+
+	//prescriptions, _ := service.GetNewHisPrescriptionTen(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+
+	var pp models.PublicParams
+	pp.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	pp.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	pp.FixmedinsName = miConfig.OrgName
+	pp.FixmedinsCode = miConfig.Code
+
+	pp.RequestUrl = miConfig.Url
+	pp.Cainfo = miConfig.Cainfo
+	pp.SecretKey = miConfig.SecretKey
+	pp.AccessKey = miConfig.AccessKey
+	pp.OpterName = roles.UserName
+
+	var config []*models.HisXtDiagnoseConfig
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		config = append(config, &diagnosisConfig)
+	}
+
+	var pd models.PatientDtos
+	pd.PatnID = his.PsnNo
+	pd.PatnName = his.Name
+	pd.Gend = his.Gend
+	pd.Brdy = his.Brdy
+	pd.Poolarea = his.InsuplcAdmdvs
+	pd.CurrMdtrtID = his.Number
+
+	var fed models.FsiEncounterDtos
+	fed.MdtrtID = his.Number
+	fed.MedinsID = miConfig.Code
+	fed.MedinsName = miConfig.OrgName
+	fed.MedinsAdmdvs = miConfig.MdtrtareaAdmvs
+	fed.MedMdtrtType = "1"
+	fed.MedinsType = "1"
+	fed.MedinsLv = "11"
+	tm := time.Unix(his.RecordDate, 0)
+	s_tm := tm.Format("2006-01-02 15:04:05")
+	fed.AdmDate = s_tm
+	fed.DscgDate = s_tm
+	fed.DscgMainDiseCodg = config[0].CountryCode
+	fed.DscgMainDiseName = config[0].CountryContentName
+	//诊断信息
+	var fdds []*models.FsiDiagnoseDtos
+	for index, item := range config {
+		if index == 0 {
+			var fdd models.FsiDiagnoseDtos
+			fdd.DiseID = strconv.FormatInt(item.ID, 10)
+			fdd.InoutDiseType = "1"
+			fdd.MaindiseFlag = "1"
+			fdd.DiseDate = s_tm
+			fdd.DiasSrtNo = "1"
+			fdd.DiseName = item.CountryContentName
+			fdd.DiseCodg = item.CountryCode
+			fdds = append(fdds, &fdd)
+
+		} else {
+			var fdd models.FsiDiagnoseDtos
+			fdd.DiseID = strconv.FormatInt(item.ID, 10)
+			fdd.InoutDiseType = "1"
+			fdd.MaindiseFlag = "1"
+			fdd.DiseDate = s_tm
+			fdd.DiasSrtNo = strconv.FormatInt(int64(index), 10)
+			fdd.DiseName = item.CountryContentName
+			fdd.DiseCodg = item.CountryCode
+			fdds = append(fdds, &fdd)
+		}
+	}
+	fed.DrCodg = strconv.FormatInt(doctor_info.ID, 10)
+	fed.AdmDeptCodg = strconv.FormatInt(department.ID, 10)
+	fed.AdmDeptName = department.Name
+	fed.DscgDeptCodg = strconv.FormatInt(department.ID, 10)
+	fed.DscgDeptName = department.Name
+	fed.MedMdtrtType = "1"
+	fed.MedType = "11"
+	//if his.Insutype == "390" {
+	//	fed.MedType = "1402"
+	//} else {
+	//	fed.MedType = "9933"
+	//}
+	var orders []*models.FsiOrderDtos
+
+	if trig_scen == "2" {
+		//处方医嘱信息
+		for _, item := range prescriptions {
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				var order models.FsiOrderDtos
+				order.RxID = strconv.FormatInt(item.ID, 10)
+				order.Rxno = strconv.FormatInt(item.ID, 10)
+				order.LongDrordFlag = "0"
+				order.HilistType = "1"
+				order.ChrgType = "1"
+				order.DrordBhvr = "-"
+				order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
+				order.HosplistName = subItem.BaseDrugLib.DrugName
+				order.HilistLv = "1"
+				order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
+				order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
+				order.HosplistName = subItem.BaseDrugLib.DrugName
+				order.Cnt = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+				order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+				order.Sumamt = fmt.Sprintf("%.2f", (subItem.PrescribingNumber * subItem.Price))
+				order.OwnpayAmt = ""
+				order.SelfpayAmt = ""
+				order.Spec = ""
+				order.SpecUnt = ""
+				order.DrordBegnDate = s_tm
+				order.DrordStopDate = ""
+				order.DrordDrCodg = "1"
+				order.DrordDeptName = department.Name
+				order.DrordDrCodg = "1"
+				order.DrordDrName = doctor_info.UserName
+				order.DrordDrProfttl = ""
+				order.CurrDrordFlag = "1"
+				orders = append(orders, &order)
+			}
+			for _, subItem := range item.HisPrescriptionProject {
+				if subItem.Type == 2 {
+					var order models.FsiOrderDtos
+					order.RxID = strconv.FormatInt(item.ID, 10)
+					order.Rxno = strconv.FormatInt(item.ID, 10)
+					order.LongDrordFlag = "0"
+					order.HilistType = "1"
+					order.ChrgType = "1"
+					order.DrordBhvr = "-"
+					order.HilistCode = subItem.HisProject.MedicalCode
+					order.HosplistName = subItem.HisProject.ProjectName
+					order.HilistLv = "1"
+					order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
+					order.HosplistCode = subItem.HisProject.MedicalCode
+					order.HosplistName = subItem.HisProject.ProjectName
+					order.Cnt = subItem.Count
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+					order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
+					order.OwnpayAmt = ""
+					order.SelfpayAmt = ""
+					order.Spec = ""
+					order.SpecUnt = ""
+					order.DrordBegnDate = s_tm
+					order.DrordStopDate = ""
+					order.DrordDrCodg = "1"
+					order.DrordDeptName = department.Name
+					order.DrordDrCodg = "1"
+					order.DrordDrName = doctor_info.UserName
+					order.DrordDrProfttl = ""
+					order.CurrDrordFlag = "1"
+					orders = append(orders, &order)
+
+				}
+				if subItem.Type == 3 {
+
+					var order models.FsiOrderDtos
+					order.RxID = strconv.FormatInt(item.ID, 10)
+					order.Rxno = strconv.FormatInt(item.ID, 10)
+					order.LongDrordFlag = "0"
+					order.HilistType = "1"
+					order.ChrgType = "1"
+					order.DrordBhvr = "-"
+					order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
+					order.HosplistName = subItem.GoodInfo.GoodName
+					order.HilistLv = "1"
+					order.HilistPric = fmt.Sprintf("%.2f", subItem.Price)
+					order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
+					order.HosplistName = subItem.GoodInfo.GoodName
+					order.Cnt = subItem.Count
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					order.Pric = fmt.Sprintf("%.2f", subItem.Price)
+					order.Sumamt = fmt.Sprintf("%.2f", subItem.Price*cnt)
+					order.OwnpayAmt = ""
+					order.SelfpayAmt = ""
+					order.Spec = ""
+					order.SpecUnt = ""
+					order.DrordBegnDate = s_tm
+					order.DrordStopDate = ""
+					order.DrordDrCodg = "1"
+					order.DrordDeptName = department.Name
+					order.DrordDrCodg = "1"
+					order.DrordDrName = doctor_info.UserName
+					order.DrordDrProfttl = ""
+					order.CurrDrordFlag = "1"
+					orders = append(orders, &order)
+
+				}
+			}
+		}
+		//处方医嘱信息
+	}
+	fed.MatnStas = "0"
+	fed.MedfeeSumamt = "0"
+	fed.OwnpayAmt = "0"
+	fed.SelfpayAmt = "0"
+	fed.AcctPayamt = "0"
+	fed.MaAmt = "0"
+	fed.HifpPayamt = "0"
+	fed.SetlTotlnum = "1"
+	fed.Insutype = his.Insutype
+	fed.ReimFlag = "0"
+	fed.OutSetlFlag = "0"
+
+	var fopd []*models.FsiOperationDtosData
+	data := make(map[string]interface{})
+	data["fed"] = fed
+	data["fdd"] = fdds
+	data["fod"] = orders
+	data["pd"] = pd
+	data["pp"] = pp
+	data["fopd"] = fopd
+	data["trig_scen"] = trig_scen
+	fmt.Println(data)
+	fmt.Println(fed)
+	fmt.Println(fdds)
+	fmt.Println(orders)
+	fmt.Println(pd)
+	fmt.Println(pp)
+	fmt.Println(fopd)
+
+	client := &http.Client{}
+	bytesData, _ := json.Marshal(data)
+	var req *http.Request
+
+	if miConfig.MdtrtareaAdmvs == "320921" {
+		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3101", bytes.NewReader(bytesData))
+	} else {
+		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3101", 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 res
+	}
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return res
+	}
+	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	result, _ := json.Marshal(respJSON)
+	if err := json.Unmarshal([]byte(result), &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return res
+	}
+
+	return res
+
+}
+
 func Check3101(c *HisApiController, patient_id int64, his_patient_id int64, admin_user_id int64, trig_scen string, record_time string, prescriptions []*models.HisPrescription) (res Result3101) {
 
 	adminUser := c.GetAdminUserInfo()
@@ -5566,6 +5848,31 @@ func (c *HisApiController) GetRegisterInfo() {
 					cert_no = bas[2]
 				}
 
+				var hisPrescription []*models.HisPrescription
+				res3101 := Check3101ForOne(c, patient.ID, his, admin_user_id, "1", record_time, hisPrescription)
+
+				if res3101.Infcode == "0" && len(res3101.Output.Result) > 0 {
+					for _, item := range res3101.Output.Result {
+						if len(res3101.ErrMsg) == 0 {
+							res3101.ErrMsg = item.VolaCont
+						} else {
+							res3101.ErrMsg = res3101.ErrMsg + "\n" + item.VolaCont
+						}
+					}
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res3101.ErrMsg,
+					})
+					return
+
+				} else if res3101.Infcode != "0" {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res3101.ErrMsg,
+					})
+					return
+				}
+
 				var api string
 				if miConfig.MdtrtareaAdmvs == "320921" {
 
@@ -6622,6 +6929,22 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 
 						} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
+							result3101 := Check3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
+							if result3101.Infcode == "0" {
+								if len(result3101.Output.Result) > 0 {
+									var errMsgs []string
+									for _, item := range result3101.Output.Result {
+										errMsgs = append(errMsgs, item.VolaCont)
+
+									}
+									c.ServeSuccessJSON(map[string]interface{}{
+										"failed_code": -10,
+										"msg":         errMsgs,
+									})
+									return
+								}
+							}
+
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 							bas := strings.Split(psn_info.CardInfo, "|")
@@ -7041,6 +7364,21 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 
 			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
+				result3101 := Check3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
+				if result3101.Infcode == "0" {
+					if len(result3101.Output.Result) > 0 {
+						var errMsgs []string
+						for _, item := range result3101.Output.Result {
+							errMsgs = append(errMsgs, item.VolaCont)
+
+						}
+						c.ServeSuccessJSON(map[string]interface{}{
+							"failed_code": -10,
+							"msg":         errMsgs,
+						})
+						return
+					}
+				}
 				psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 				psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
@@ -8234,6 +8572,22 @@ func (c *HisApiController) GetPreUploadInfo() {
 				}
 
 			} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
+				result3101 := Check3101(c, id, his_patient_id, admin_user_id, "2", record_time, prescriptions)
+				if result3101.Infcode == "0" {
+					if len(result3101.Output.Result) > 0 {
+						var errMsgs []string
+						for _, item := range result3101.Output.Result {
+							errMsgs = append(errMsgs, item.VolaCont)
+
+						}
+						c.ServeSuccessJSON(map[string]interface{}{
+							"failed_code": -10,
+							"msg":         errMsgs,
+						})
+						return
+					}
+				}
+
 				bytesData, _ := json.Marshal(data)
 				var req *http.Request
 				if miConfig.MdtrtareaAdmvs == "320921" {
@@ -8556,6 +8910,22 @@ func (c *HisApiController) GetPreUploadInfo() {
 						}
 
 					} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
+						result3101 := Check3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
+						if result3101.Infcode == "0" {
+							if len(result3101.Output.Result) > 0 {
+								var errMsgs []string
+								for _, item := range result3101.Output.Result {
+									errMsgs = append(errMsgs, item.VolaCont)
+
+								}
+								c.ServeSuccessJSON(map[string]interface{}{
+									"failed_code": -10,
+									"msg":         errMsgs,
+								})
+								return
+							}
+						}
+
 						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 						psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 

service/fj_service.go

@@ -764,12 +764,12 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3201"                 // 交易编码
-	inputData["url"] = baseParams.RequestUrl       // 险种
-	inputData["app_id"] = baseParams.AppID         // 险种
-	inputData["app_secret"] = baseParams.AppSecret // 险种
-	inputData["sign_key"] = baseParams.SignKey     // 险种
-	inputData["enc_key"] = baseParams.EncKey       // 险种
+	inputMessage["infno"] = "3201"                    // 交易编码
+	inputMessage["url"] = baseParams.RequestUrl       // 险种
+	inputMessage["app_id"] = baseParams.AppID         // 险种
+	inputMessage["app_secret"] = baseParams.AppSecret // 险种
+	inputMessage["sign_key"] = baseParams.SignKey     // 险种
+	inputMessage["enc_key"] = baseParams.EncKey       // 险种
 
 	inputData["insutype"] = businessParams.Insutype                   // 险种
 	inputData["clr_type"] = businessParams.ClrType                    // 就诊 ID（来自2201接口返回）

service/his_service.go

@@ -520,6 +520,11 @@ func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date
 	return
 }
 
+func FindLastPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND patient_id = ?", org_id, record_date, patient_id).Last(&info).Error
+	return
+}
+
 func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	err = writeDb.Save(&info).Error
 	return