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 + ":" + fmt.Sprintf("%.2f", subItem.BaseDrugLib.Dose) + 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 + ":" + fmt.Sprintf("%.2f", subItem.BaseDrugLib.Dose) + 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)