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

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() {
 						}
 
 					}
+
 				}
 			}
 			//
@@ -3113,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",
@@ -3134,6 +3156,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 					}
 
 				}
+
 			}
 		}
 		//