代码修改

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrescriptionController.java

@@ -206,10 +206,12 @@ public class PrescriptionController extends BaseController{
	public Result getDispUnSettleFeeList(@ApiParam(name="cardNo",value="病人卡号",defaultValue = "")
										 @RequestParam(value = "cardNo",required = true) String cardNo,
										 @ApiParam(name="visitNo",value="挂号号",defaultValue = "")
										 @RequestParam(value = "visitNo",required = true) String visitNo)
										 @RequestParam(value = "visitNo",required = true) String visitNo,
										 @ApiParam(name="recipeNo",value="处方号",defaultValue = "")
										 @RequestParam(value = "recipeNo",required = true) String recipeNo)
	{
		try {
			String re = prescriptionService.getDispUnSettleFeeInfoList(cardNo,visitNo);
			String re = prescriptionService.getDispUnSettleFeeInfoList(cardNo,visitNo,recipeNo);
			return Result.success("查询处方结算结果列表！",re);
		} catch (Exception ex) {
@@ -241,10 +243,12 @@ public class PrescriptionController extends BaseController{
			@ApiParam(name="fadeDept",value="科室编码",defaultValue = "")
			@RequestParam(value = "fadeDept",required = true) String fadeDept,
			@ApiParam(name="fadeOperator",value="医生编码",defaultValue = "")
			@RequestParam(value = "fadeOperator",required = true) String fadeOperator
			@RequestParam(value = "fadeOperator",required = true) String fadeOperator,
			@ApiParam(name="recipeNo",value="处方号",defaultValue = "")
			@RequestParam(value = "recipeNo",required = true) String recipeNo
	){
		try {
			String re = prescriptionService.fadeRecipe(visitNo,fadeDept,fadeOperator);
			String re = prescriptionService.fadeRecipe(visitNo,fadeDept,fadeOperator,recipeNo);
			return Result.success("挂号作废处方接口！",re);
		} catch (Exception ex) {
			ex.printStackTrace();

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/dao/prescription/PrescriptionDao.java

@@ -28,9 +28,6 @@ public interface PrescriptionDao extends PagingAndSortingRepository<Prescription
    @Query("select p from Prescription p where p.jwCode=?1 and p.status=?2 ")
    List<Prescription> fingdByJwCodeAndStatus(String jwcode, Integer status);
    @Query("from Prescription p where p.visitNo=?1")
    Prescription findByVisitNo(String visitNo);
    @Query("from Prescription p where p.visitNo=?1 and p.recipeNo=?2")
    Prescription findByVisitNoAndRecipeNo(String visitNo,String recipeNo);
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

@@ -666,9 +666,9 @@ public class PrescriptionService extends ZysoftBaseService{
     * @return
     * @throws Exception
     */
    public String getDispUnSettleFeeInfoList(String cardNo, String visitNo)  throws Exception
    public String getDispUnSettleFeeInfoList(String cardNo, String visitNo,String recipeNo)  throws Exception
    {
        Prescription prescription = prescriptionDao.findByVisitNo(visitNo);
        Prescription prescription = prescriptionDao.findByVisitNoAndRecipeNo(visitNo,recipeNo);
        String[] hospitalMapping = getHospitalMapping(prescription.getHospital()); //获取机构映射
        String hospital = hospitalMapping[0];
@@ -769,8 +769,8 @@ public class PrescriptionService extends ZysoftBaseService{
     * @param fadeDept  科室编码
     * @param fadeOperator 医生编码
     */
    public String fadeRecipe(String visitNo, String fadeDept, String fadeOperator) throws Exception{
        Prescription prescription = prescriptionDao.findByVisitNo(visitNo);
    public String fadeRecipe(String visitNo, String fadeDept, String fadeOperator,String recipeNo) throws Exception{
        Prescription prescription = prescriptionDao.findByVisitNoAndRecipeNo(visitNo,recipeNo);
        String[] hospitalMapping = getHospitalMapping(prescription.getHospital()); //获取机构映射
        String hospital = hospitalMapping[0];