1

controllers/sz/sz_his_api_controller.go

@@ -2312,7 +2312,17 @@ func (c *SZHisApiController) GetSettleInfo() {
 							}
 							customs = append(customs, cus)
 
-						} else if subItem.Type == 3 {
+						}
+
+					}
+					if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+
+						detItemFeeSumamt, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)), 64)
+						//count, _ := strconv.ParseFloat(fmt.Sprintf("%f", subItem.Count), 64)
+						count, _ := strconv.ParseFloat(strconv.FormatInt(subItem.Count, 10), 64)
+						temp := strings.Split(subItem.FeedetlSn, "-")
+						newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
+						if subItem.Type == 3 {
 							cus := &models.CustomDetail{
 								PrescriptionNumber: chrg_bchno,
 								OrderType:          "1",
@@ -2333,6 +2343,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 						}
 
 					}
+
 				}
 			}
 			//
@@ -2619,7 +2630,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 		}
 
 	} else {
-		if tempOrder.OrderStatus == 4 {
+		if tempOrder.OrderStatus == 1 && tempOrder.IsPre == 1 {
 			pay_way, _ := c.GetInt64("pay_way")
 			pay_price, _ := c.GetFloat("pay_price")
 			pay_card_no := c.GetString("pay_card_no")
@@ -2779,6 +2790,11 @@ func (c *SZHisApiController) GetSettleInfo() {
 				return
 			}
 
+		} else {
+
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
+			return
+
 		}
 
 	}
@@ -3108,7 +3124,18 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 						}
 						customs = append(customs, cus)
 
-					} else if subItem.Type == 3 {
+					}
+
+				}
+
+				if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+
+					detItemFeeSumamt, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)), 64)
+					//count, _ := strconv.ParseFloat(fmt.Sprintf("%f", subItem.Count), 64)
+					count, _ := strconv.ParseFloat(strconv.FormatInt(subItem.Count, 10), 64)
+					temp := strings.Split(subItem.FeedetlSn, "-")
+					newFl := fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) + "-" + temp[1] + "-" + temp[2]
+					if subItem.Type == 3 {
 						cus := &models.CustomDetail{
 							PrescriptionNumber: chrg_bchno,
 							OrderType:          "1",
@@ -3129,6 +3156,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 					}
 
 				}
+
 			}
 		}
 		//
@@ -3227,7 +3255,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 			SettleAccountsDate:  recordDateTime,
 			Ctime:               time.Now().Unix(),
 			Mtime:               time.Now().Unix(),
-			Status:              1,
+			Status:              0,
 			Number:              chrg_bchno,
 			Infcode:             0,
 			WarnMsg:             "",
@@ -3235,7 +3263,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 			ErrMsg:              "",
 			RespondTime:         "",
 			InfRefmsgid:         "",
-			OrderStatus:         4,
+			OrderStatus:         1,
 			IsMedicineInsurance: 1,
 			SettleType:          settle_accounts_type,
 			SettleStartTime:     start_time,
@@ -3344,7 +3372,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 				}
 
 				if res.Transreturncode == "00000000" {
-					order.OrderStatus = 4
+					order.OrderStatus = 1
 					order.Status = 1
 					order.PsnNo = health_card_no
 					order.Modify = admin_user_id
@@ -3366,6 +3394,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 					detailStrThree := string(setlDetailThree)
 					order.SzMedicineInsuranceInfo = detailStrThree
 					order.Cainfo = result_three
+					order.IsPre = 1
 					//err = service.UpdataOrderStatusTwo(order.Number, adminUser.CurrentOrgId)
 					err = service.UpDateOrderTwo(order)
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -4765,7 +4794,7 @@ func (c *SZHisApiController) GetDrugList() {
 		recordDate := time.Unix(item.RecordDate, 0).Format(timeLayout)
 
 		detail := &models.DrugDetail{
-			MedicalInsuranceNumber: item.SocialSecurityDirectoryCode,
+			MedicalInsuranceNumber: item.MedicalInsuranceNumber,
 			Code:                   item.Code,
 			DrugName:               item.DrugName,
 			DrugSpec:               item.DrugSpec,

models/his_models.go

@@ -693,6 +693,7 @@ type HisOrder struct {
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
 
 	PType int64 `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre int64 `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (HisOrder) TableName() string {

service/his_service.go

@@ -599,6 +599,7 @@ type HisOrder struct {
 	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
 	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify                int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	IsPre                 int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 
 	SzChargeInfo            string `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
 	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`