111

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10387
+org_id = 10340
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/coordinate/coordinate_controller.go

@@ -40,8 +40,8 @@ type ResultQuery struct {
 	Result []struct {
 		Type      string `json:"type"`
 		Name      string `json:"name"`
-		Vaa01     int    `json:"vaa01"`
-		Vaa07     int    `json:"vaa07"`
+		Vaa01     int64  `json:"vaa01"`
+		Vaa07     int64  `json:"vaa07"`
 		Visittime string `json:"visittime"`
 	} `json:"result"`
 	Code string `json:"code"`
@@ -226,8 +226,9 @@ func (c *CoordinateController) SettleAccount() {
 			info.Diag = append(info.Diag, &diag)
 		}
 		var presInfos []*models.PresInfo
-		var presDetails []*models.PresDetail
+
 		for index, item := range prescriptions {
+			var presDetails []*models.PresDetail
 			var presDetail models.PresDetail
 			var presInfo models.PresInfo
 			presInfo.Cbmid = strconv.FormatInt(item.ID, 10)
@@ -238,9 +239,9 @@ func (c *CoordinateController) SettleAccount() {
 			}
 
 			if item.Type == 1 {
-				presInfo.Cbm07 = item.MedType
+				presInfo.Cbm07 = ""
 			} else {
-				presInfo.Cbm07 = item.MedType
+				presInfo.Cbm07 = ""
 			}
 
 			presDetail.Vaf59 = strconv.FormatInt(int64(index+1), 10)
@@ -251,7 +252,7 @@ func (c *CoordinateController) SettleAccount() {
 				var infoItem models.Item
 				infoItem.Rownr = strconv.FormatInt(int64(index+1), 10)
 				infoItem.Vaf11 = "2"
-				infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+				infoItem.Vaf36 = time.Unix(subItem.StartTime, 0).Format("2006-01-02 15:04:05")
 				infoItem.Bbx01 = subItem.BaseDrugLib.MedicalInsuranceNumber
 				infoItem.Bda01 = "1"
 				infoItem.Bby01 = ""
@@ -261,6 +262,8 @@ func (c *CoordinateController) SettleAccount() {
 				infoItem.Vaf14 = subItem.BaseDrugLib.DrugName
 				infoItem.Bdi01 = ef.Code
 				infoItem.Vaf17 = strconv.FormatInt(subItem.Day, 10)
+				infoItem.Vaf18 = fmt.Sprintf("%.2f", subItem.SingleDose)
+
 				infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
 				infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
 				infoItem.Vaf35 = "0"
@@ -275,22 +278,23 @@ func (c *CoordinateController) SettleAccount() {
 				//ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
 
 				if subItem.Type == 2 {
-					if subItem.HisProject.CostClassify == 10 {
+					fmt.Println(subItem.HisProject.CostClassify)
+					if subItem.HisProject.CostClassify == 100 {
 						var infoItem models.Item
 						infoItem.Rownr = "0"
 						infoItem.Vaf11 = "2"
-						infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+						infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
 						infoItem.Bbx01 = subItem.HisProject.MedicalCode
 						infoItem.Bda01 = "Z"
 						infoItem.Bby01 = ""
 						infoItem.Vaf14 = subItem.HisProject.ProjectName
 						infoItem.Vaf15 = subItem.HisProject.ProjectName
 						infoItem.Bdi01 = "160"
-						infoItem.Vaf17 = subItem.Day
+						infoItem.Vaf17 = "1"
 						infoItem.Vaf20 = subItem.SingleDose
 						infoItem.Vaf21 = subItem.Count
 						infoItem.Vaf35 = "0"
-						infoItem.Vaf18 = 0
+						infoItem.Vaf18 = ""
 						infoItem.Vaf32 = "1"
 						infoItem.Bck01b = departmwnt.Number
 						infoItem.Bck01d = departmwnt.Number
@@ -303,7 +307,7 @@ func (c *CoordinateController) SettleAccount() {
 						var infoItem models.Item
 						infoItem.Rownr = "0"
 						infoItem.Vaf11 = "1"
-						infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+						infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
 						infoItem.Bbx01 = subItem.HisProject.MedicalCode
 
 						if subItem.HisProject.CostClassify == 2 {
@@ -321,7 +325,7 @@ func (c *CoordinateController) SettleAccount() {
 						infoItem.Vaf20 = subItem.SingleDose
 						infoItem.Vaf21 = subItem.Count
 						infoItem.Vaf35 = "0"
-						infoItem.Vaf18 = 0
+						infoItem.Vaf18 = fmt.Sprintf("%.2f", subItem.SingleDose)
 						infoItem.Vaf32 = "0"
 						infoItem.Bck01b = departmwnt.Number
 						infoItem.Bck01d = departmwnt.Number
@@ -335,7 +339,7 @@ func (c *CoordinateController) SettleAccount() {
 					var infoItem models.Item
 					infoItem.Rownr = "0"
 					infoItem.Vaf11 = "1"
-					infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+					infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
 					infoItem.Bbx01 = subItem.GoodInfo.MedicalInsuranceNumber
 					infoItem.Bda01 = "M"
 					infoItem.Bby01 = ""
@@ -355,6 +359,7 @@ func (c *CoordinateController) SettleAccount() {
 				}
 
 			}
+
 			presDetail.Item = infoItems
 			presDetails = append(presDetails, &presDetail)
 			presInfo.PresDetail = presDetails
@@ -447,7 +452,7 @@ func (c *CoordinateController) SettleAccount() {
 			}
 			err = service.CreateOrder(order)
 			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderExceptionT)
 				return
 			}
 

service/coordinate_service.go

@@ -21,13 +21,11 @@ func GetUnSettleHisPrescriptionFiveTen(org_id int64, patient_id int64, record_da
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
-		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
-	}).
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 and order_status <> 5  AND p_type = ?", org_id, record_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
@@ -374,6 +372,6 @@ func UpdataOrderStatusThreeTen(number string, user_org_id int64) (err error) {
 }
 
 func GetExecutionFrequencyByName(name string, org_id int64) (ef models.ExecutionFrequencyDic, err error) {
-	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("org_id = ? AND name = ?", org_id, name).First(&ef).Error
+	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("(org_id = ? OR org_id = 0) AND name = ?", org_id, name).First(&ef).Error
 	return
 }