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

controllers/zh/zh_his_api_controller.go

@@ -1572,6 +1572,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		var customs []*models.NewCustom
 
 		for _, item := range prescriptions {
+			tm := time.Unix(item.PreTime, 0)
 			if item.Type == 1 { //药品
 				for _, subItem := range item.HisDoctorAdviceInfo {
 					if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 && subItem.BaseDrugLib.IsUser != 1 {
@@ -1584,6 +1585,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 							Price:            fmt.Sprintf("%.4f", subItem.Price),
 							MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 							HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
+							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 						}
 
 						customs = append(customs, cus)
@@ -1605,6 +1607,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 								MedListCodg:      subItem.HisProject.MedicalCode,
 								HospApprFlag:     -1,
+								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 							}
 							customs = append(customs, cus)
 						}
@@ -1619,6 +1622,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 								MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
 								HospApprFlag:     -1,
+								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 							}
 							customs = append(customs, cus)
 						}
@@ -1626,19 +1630,20 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				}
 			}
 
-			for _, subItem := range item.HisAdditionalCharge {
-				if len(subItem.XtHisAddtionConfig.Code) > 0 {
-					cus := &models.NewCustom{
-						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
-						MedListCodg:      subItem.XtHisAddtionConfig.Code,
-						HospApprFlag:     -1,
-					}
-					customs = append(customs, cus)
-				}
-			}
+			//for _, subItem := range item.HisAdditionalCharge {
+			//	if len(subItem.XtHisAddtionConfig.Code) > 0 {
+			//		cus := &models.NewCustom{
+			//			DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
+			//			Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
+			//			FeedetlSn:        subItem.FeedetlSn,
+			//			Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+			//			MedListCodg:      subItem.XtHisAddtionConfig.Code,
+			//			HospApprFlag:     -1,
+			//
+			//		}
+			//		customs = append(customs, cus)
+			//	}
+			//}
 		}
 
 		//总页数,向上取整,注意除之前要先转换类型为float64

models/his_models.go

@@ -322,6 +322,7 @@ type HisPrescription struct {
 	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime                int64                     `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
 	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
@@ -1279,6 +1280,7 @@ type NewCustom struct {
 	MedListCodg      string
 	LmtUsedFlag      int64
 	HospApprFlag     int64
+	FeeOcurTime      string
 }
 
 type HisPsn struct {

service/zh_his_service.go

@@ -580,7 +580,7 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
 		feedetailInfo["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
 		feedetailInfo["med_type"] = med_type
-		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额