|
@@ -27,10 +27,7 @@ import thyyxxk.webserver.entity.medicaladvice.medicamanage.drugmanage.PageClassE
|
|
|
import thyyxxk.webserver.entity.medicine.YpZdDictVo;
|
|
|
import thyyxxk.webserver.entity.medicine.YpZdGroupName;
|
|
|
import thyyxxk.webserver.service.medicaladvice.common.MedicalCommonService;
|
|
|
-import thyyxxk.webserver.utils.AssertUtil;
|
|
|
-import thyyxxk.webserver.utils.CommonUtil;
|
|
|
-import thyyxxk.webserver.utils.ResultVoUtil;
|
|
|
-import thyyxxk.webserver.utils.TokenUtil;
|
|
|
+import thyyxxk.webserver.utils.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.lang.reflect.Field;
|
|
@@ -194,10 +191,7 @@ public class GenerateYzService {
|
|
|
}
|
|
|
if(CollUtil.isNotEmpty(param.getYzYpZyOrders())){
|
|
|
log.info("最终生成的药品医嘱:{}",param.getYzYpZyOrders());
|
|
|
- List<List<YzYpZyOrder>> tempYpZyOrder = CollUtil.split(param.getYzYpZyOrders(), 50);
|
|
|
- for(List<YzYpZyOrder> temp : tempYpZyOrder){
|
|
|
- yzYpZyOrderDao.batchInsertData(temp);
|
|
|
- }
|
|
|
+ yzYpZyOrderDao.insert(param.getYzYpZyOrders());
|
|
|
}
|
|
|
//修改状态
|
|
|
if(CollUtil.isNotEmpty(param.getUpdateStatusYzActOrders())) {
|
|
@@ -831,7 +825,7 @@ public class GenerateYzService {
|
|
|
.infantFlag(zyActpatient.getInpatientNo().contains("$") ? "1" : "0")
|
|
|
.name(zyActpatient.getName())
|
|
|
//默认给1
|
|
|
- .statusFlag("1")
|
|
|
+ .statusFlag(PageClassEnum.JSY.getCode().equals(yzActOrder.getSelfBuy()) ? "3" : "1")
|
|
|
.wardCode(zyActpatient.getWardCode())
|
|
|
.retprice(ypZdDictVo.getPackRetprice())
|
|
|
.serial(ypZdDictVo.getSerial())
|