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
@@ -53,7 +53,7 @@ call_domain = https://hf.sgjyun.com
 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/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/"
@@ -61,7 +61,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 # 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/sg/his_api_controller.go

@@ -670,6 +670,10 @@ func (c *HisApiController) GetSettleList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
 		return
 	}
+	last_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
+	count, _ := strconv.ParseInt(last_order.FaPiaoNumber, 10, 64)
+	new_fapiao_number := strconv.FormatInt(count, 10)
+
 	struct4101 := service.Struct4101{
 		PsnNo:          order.PsnNo,
 		MdtrtId:        order.MdtrtId,
@@ -689,9 +693,9 @@ func (c *HisApiController) GetSettleList() {
 		HiType:         order.Insutype,
 		Insuplc:        miConfig.InsuplcAdmdvs,
 		MaindiagFlag:   "1",
-		BillCode:       order.FaPiaoCode,
+		BillCode:       last_order.FaPiaoCode,
 		BillNo:         order.FaPiaoNumber,
-		BizSn:          order.Number,
+		BizSn:          new_fapiao_number,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,
 		AcctPay:        order.AcctPay,
@@ -705,19 +709,6 @@ func (c *HisApiController) GetSettleList() {
 	}
 	struct4101.SetlBegnDate = order.SetlTime
 	struct4101.SetlEndDate = order.SetlTime
-	//if order.SettleType == 1 {
-	//	t := time.Unix(int64(order.SettleAccountsDate), 0)
-	//	dateStr := t.Format("2006-01-02")
-	//	struct4101.SetlBegnDate = dateStr
-	//	struct4101.SetlEndDate = dateStr
-	//} else {
-	//	t := time.Unix(int64(order.SettleStartTime), 0)
-	//	t2 := time.Unix(int64(order.SettleEndTime), 0)
-	//	dateStartStr := t.Format("2006-01-02")
-	//	dateEndStr := t2.Format("2006-01-02")
-	//	struct4101.SetlBegnDate = dateStartStr
-	//	struct4101.SetlEndDate = dateEndStr
-	//}
 
 	var rf []CustomFundPay
 	json.Unmarshal([]byte(order.SetlDetail), &rf)
@@ -1143,8 +1134,14 @@ func (c *HisApiController) GetSettleList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-
 	if res.Infcode != 0 {
+		order.FaPiaoNumber = new_fapiao_number
+		order.FaPiaoCode = last_order.FaPiaoCode
+		err := service.UpdateOrder(order)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"failed_code": -10,
 			"msg":         res.ErrMsg,
@@ -3818,11 +3815,11 @@ func (c *HisApiController) GetUploadInfo() {
 			data["doctor_id"] = strconv.FormatInt(roles.AdminUserId, 10)
 			data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
 			data["fixmedins_code"] = miConfig.Code
-			if (department.ID == 0 && adminUser.CurrentOrgId == 9919) || (department.ID == 0 && adminUser.CurrentOrgId == 10106) {
-				data["dept_code"] = "15"
-			} else {
-				data["dept_code"] = department.Number
-			}
+			//if (department.ID == 0 && adminUser.CurrentOrgId == 9919) || (department.ID == 0 && adminUser.CurrentOrgId == 10106) {
+			//	data["dept_code"] = "15"
+			//} else {
+			data["dept_code"] = department.Number
+			//}
 
 			data["insuplc_admdvs"] = his.InsuplcAdmdvs
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs

service/his_service.go

@@ -1292,6 +1292,11 @@ func GetLastHisOrder(org_id int64) (his models.HisOrder, err error) {
 	return
 }
 
+func GetLastHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code <> '' AND fa_piao_number <> ''", org_id).Last(&his).Error
+	return
+}
+
 func GetHisPatientInfoTwo(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
@@ -1413,3 +1418,8 @@ func GetClearRecordById(id int64) (record models.HisYidiClearRecord, err error)
 	err = readDb.Model(&models.HisYidiClearRecord{}).Where("id = ? AND status = 1").First(&record).Error
 	return
 }
+
+func UpdateOrder(order models.HisOrder) (err error) {
+	err = writeDb.Save(&order).Error
+	return
+}