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

conf/app.conf

@@ -54,7 +54,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 gdyb_paasid = "sg03_prd"
-#    gdyb_paasid = "jm_sc_yjyy"
+#gdyb_paasid = "jm_sc_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sg/gdyb_controller.go

@@ -71,19 +71,17 @@ func (c *GdybController) PostOne() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 	fixmedins_code := c.GetString("fixmedins_code")
-
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-
 	secret_key := c.GetString("secret_key")
 	id_card_type, _ := c.GetInt64("id_card_type")
 	card_sn := c.GetString("card_sn")
-
 	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn)
-
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
 	} else {
+
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/sg/his_api_controller.go

@@ -70,6 +70,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/test", &HisApiController{}, "get:TestGetBasBaseInfo")
 
 	beego.Router("/api/reversal", &HisApiController{}, "get:ReversalData")
+	beego.Router("/api/reversal/other", &HisApiController{}, "get:ReversalOtherData")
 
 }
 
@@ -1186,6 +1187,12 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Mtime = time.Now().Unix()
 			his.Status = 1
 			err := service.CreateHisPatientTwo(&his)
+
+			lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+			if len(lists) == 1 {
+				service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
+			}
+
 			if err == nil {
 				api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
@@ -1316,6 +1323,8 @@ func (c *HisApiController) GetRegisterInfo() {
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
@@ -1374,7 +1383,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	his, _ := service.GetNewVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -2820,6 +2829,8 @@ func (c *HisApiController) RefundNumber() {
 }
 func (c *HisApiController) RefundDetail() {
 	order_id, _ := c.GetInt64("order_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	number := c.GetString("number")
 	record_time := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
@@ -2833,7 +2844,7 @@ func (c *HisApiController) RefundDetail() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
@@ -4399,13 +4410,6 @@ func (c *HisApiController) ReversalData() {
 
 	customData = append(customData, custom7)
 
-	custom77 := &CustomData{
-		MsgId: "H44022900158202103301736551640",
-		PsnNo: "44020000001102687718",
-		Info:  "2207",
-	}
-	customData = append(customData, custom77)
-
 	custom8 := &CustomData{
 		MsgId: "H44022900158202103301743097676",
 		PsnNo: "44020000001102127785",
@@ -4488,6 +4492,142 @@ func (c *HisApiController) ReversalData() {
 		fmt.Println(result)
 	}
 }
+func (c *HisApiController) ReversalOtherData() {
+	var customData []*CustomData
+
+	custom := &CustomData{
+		MsgId: "H44022900158202103301714472004",
+		PsnNo: "44020000001101329945",
+		Info:  "2208",
+	}
+	customData = append(customData, custom)
+
+	custom1 := &CustomData{
+		MsgId: "H4402290015820210330172057803",
+		PsnNo: "44020000001101161813",
+		Info:  "2208",
+	}
+	customData = append(customData, custom1)
+	custom2 := &CustomData{
+		MsgId: "H44022900158202103301705198813",
+		PsnNo: "44190000133097375417",
+		Info:  "2208",
+	}
+	customData = append(customData, custom2)
+	custom3 := &CustomData{
+		MsgId: "H44022900158202103301715524756",
+		PsnNo: "44020000001100187221",
+		Info:  "2208",
+	}
+	customData = append(customData, custom3)
+	custom4 := &CustomData{
+		MsgId: "H44022900158202103301730376224",
+		PsnNo: "44020000001101959155",
+		Info:  "2208",
+	}
+	customData = append(customData, custom4)
+	custom5 := &CustomData{
+		MsgId: "H44022900158202103301748008725",
+		PsnNo: "44020000001104246641",
+		Info:  "2208",
+	}
+	customData = append(customData, custom5)
+	custom6 := &CustomData{
+		MsgId: "H44022900158202103301718096755",
+		PsnNo: "44020000001102211860",
+		Info:  "2208",
+	}
+	customData = append(customData, custom6)
+	custom7 := &CustomData{
+		MsgId: "H44022900158202103301736551640",
+		PsnNo: "44020000001102687718",
+		Info:  "2208",
+	}
+
+	customData = append(customData, custom7)
+
+	custom8 := &CustomData{
+		MsgId: "H44022900158202103301743097676",
+		PsnNo: "44020000001102127785",
+		Info:  "2208",
+	}
+	customData = append(customData, custom8)
+	custom9 := &CustomData{
+		MsgId: "H44022900158202103301712304203",
+		PsnNo: "44020000001101518097",
+		Info:  "2208",
+	}
+	customData = append(customData, custom9)
+	custom10 := &CustomData{
+		MsgId: "H44022900158202103301738448785",
+		PsnNo: "44020000001100500813",
+		Info:  "2208",
+	}
+	customData = append(customData, custom10)
+
+	custom11 := &CustomData{
+		MsgId: "H44022900158202103301732455843",
+		PsnNo: "44020000001102690557",
+		Info:  "2208",
+	}
+
+	customData = append(customData, custom11)
+
+	custom12 := &CustomData{
+		MsgId: "H44022900158202103301745421708",
+		PsnNo: "44020000001102211928",
+		Info:  "2208",
+	}
+	customData = append(customData, custom12)
+
+	custom1212 := &CustomData{
+		MsgId: "H440229001582021033017351627",
+		PsnNo: "44020000001102481733",
+		Info:  "2208",
+	}
+	customData = append(customData, custom1212)
+
+	custom13 := &CustomData{
+		MsgId: "H44022900158202103301740327951",
+		PsnNo: "44020000001103174866",
+		Info:  "2208",
+	}
+	customData = append(customData, custom13)
+	custom14 := &CustomData{
+		MsgId: "H4402290015820210330174922668",
+		PsnNo: "44020000001102927272",
+		Info:  "2208",
+	}
+	customData = append(customData, custom14)
+	custom15 := &CustomData{
+		MsgId: "H44022900158202103301752362273",
+		PsnNo: "44020000001102942890",
+		Info:  "2208",
+	}
+	customData = append(customData, custom15)
+
+	custom16 := &CustomData{
+		MsgId: "H44022900158202103301751082917",
+		PsnNo: "44020000001101662162",
+		Info:  "2208",
+	}
+	customData = append(customData, custom16)
+
+	custom17 := &CustomData{
+		MsgId: "H44022900158202103301754147728",
+		PsnNo: "44020000000229014511",
+		Info:  "2208",
+	}
+	customData = append(customData, custom17)
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+
+	for _, item := range customData {
+		result := service.Gdyb2601(item.PsnNo, item.MsgId, item.Info, miConfig.OrgName, "张俊杰", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+		fmt.Println(result)
+	}
+}
 
 func PathExists(path string) (bool, error) {
 	_, err := os.Stat(path)

controllers/sz/sz_his_api_controller.go

@@ -1004,6 +1004,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -1072,6 +1076,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -1139,6 +1147,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -1202,6 +1214,10 @@ func (c *SZHisApiController) GetRegisterInfo() {
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
+						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+						if len(lists) == 1 {
+							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
+						}
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "挂号成功",
 						})
@@ -2108,6 +2124,7 @@ func (c *SZHisApiController) RefundNumber() {
 
 //上传明细----结算----确认订单
 func (c *SZHisApiController) GetSettleInfo() {
+
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
@@ -2121,6 +2138,9 @@ func (c *SZHisApiController) GetSettleInfo() {
 	patient_id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -2192,7 +2212,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	his, err := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	his, err := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	mz_number := his.Number
 	number := miConfig.Code + year + month + day +
 		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
@@ -2388,6 +2408,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 			Creator:             admin_user_id,
 			Modify:              admin_user_id,
 			OrgSetlNumber:       number,
+			MdtrtId:             mz_number,
 		}
 		data, _ := json.Marshal(ress)
 		order.DetailLog = string(data)

service/his_service.go

@@ -190,6 +190,11 @@ func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info
 	return
 }
 
+func GetNewHisPatientInfo(org_id int64, id int64, record_date int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, id).First(&info).Error
+	return
+}
+
 func GetXTPatientInfo(org_id int64, patient_id int64) (info models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1  AND id = ?", org_id, patient_id).First(&info).Error
 	return
@@ -456,6 +461,11 @@ func GetVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (inf
 	return
 }
 
+func GetNewVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info models.VMHisPatient, err error) {
+	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, patient_id).First(&info).Error
+	return
+}
+
 func GetHisPatientRecord(org_id int64, id int64) (info models.VMHisPatient, err error) {
 	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND id = ?", org_id, id).First(&info).Error
 	return
@@ -1114,3 +1124,13 @@ func GetAllPatient(org_id int64) (patients []*models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", org_id).Find(&patients).Error
 	return
 }
+
+func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	return
+}
+
+func GetHisPatientInfoList(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
+	return
+}