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

controllers/sz/sz_his_api_controller.go

@@ -2281,7 +2281,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 							DoctorCode:         doctor_code,
 							Total:              detItemFeeSumamt,
 							DoseCode:           dose_code,
-							Spec:               strconv.Itoa(int(subItem.BaseDrugLib.MinNumber)) + "*" + subItem.BaseDrugLib.MinUnit + ":" + strconv.FormatFloat(subItem.BaseDrugLib.Dose, 'E', -1, 64) + subItem.BaseDrugLib.DoseUnit,
+							Spec:               strconv.Itoa(int(subItem.BaseDrugLib.MinNumber)) + "*" + subItem.BaseDrugLib.MinUnit + ":" + fmt.Sprintf("%.2f", subItem.BaseDrugLib.Dose) + subItem.BaseDrugLib.DoseUnit,
 							Unit:               subItem.PrescribingNumberUnit,
 						}
 						customs = append(customs, cus)
@@ -3100,7 +3100,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 						DoctorCode:         doctor_code,
 						Total:              detItemFeeSumamt,
 						DoseCode:           dose_code,
-						Spec:               strconv.Itoa(int(subItem.BaseDrugLib.MinNumber)) + "*" + subItem.BaseDrugLib.MinUnit + ":" + strconv.FormatFloat(subItem.BaseDrugLib.Dose, 'E', -1, 64) + subItem.BaseDrugLib.DoseUnit,
+						Spec:               strconv.Itoa(int(subItem.BaseDrugLib.MinNumber)) + "*" + subItem.BaseDrugLib.MinUnit + ":" + fmt.Sprintf("%.2f", subItem.BaseDrugLib.Dose) + subItem.BaseDrugLib.DoseUnit,
 						Unit:               subItem.PrescribingNumberUnit,
 					}
 					customs = append(customs, cus)
@@ -4540,6 +4540,8 @@ func (c *SZHisApiController) CancelOrderDetail() {
 	order_id, _ := c.GetInt64("order_id")
 	record_time := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -4583,7 +4585,7 @@ func (c *SZHisApiController) CancelOrderDetail() {
 		}
 		customs = append(customs, cus)
 	}
-	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	his, _ := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 
 	verifyCode, version_code := ReadCardGetCode("FY002" + "|" + order.OrgSetlNumber + "|" + miConfig.Code)